summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2014-02-15 14:23:10 +0000
committerjsg <jsg@openbsd.org>2014-02-15 14:23:10 +0000
commitd3ec4b08ec8116f9d8420badb4ce170bd3469813 (patch)
tree803ba36c7d6d33752871af8af068ebc62527e6bc
parentdrm/radeon: skip colorbuffer checking if COLOR_INFO.FORMAT is set to INVALID (diff)
downloadwireguard-openbsd-d3ec4b08ec8116f9d8420badb4ce170bd3469813.tar.xz
wireguard-openbsd-d3ec4b08ec8116f9d8420badb4ce170bd3469813.zip
drm/radeon: disable ss on DP for DCE3.x
From Alex Deucher b069c7f6ed4d74d9eff333a093ebb94f38af3db1 in ubuntu 3.8 d8e24525094200601236fa64a54cf73e3d682f2e in mainline linux
-rw-r--r--sys/dev/pci/drm/radeon/atombios_crtc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/radeon/atombios_crtc.c b/sys/dev/pci/drm/radeon/atombios_crtc.c
index 8166a8edfa9..74ec22493aa 100644
--- a/sys/dev/pci/drm/radeon/atombios_crtc.c
+++ b/sys/dev/pci/drm/radeon/atombios_crtc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atombios_crtc.c,v 1.3 2014/02/10 01:11:37 jsg Exp $ */
+/* $OpenBSD: atombios_crtc.c,v 1.4 2014/02/15 14:23:10 jsg Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
* Copyright 2008 Red Hat Inc.
@@ -939,11 +939,14 @@ static bool atombios_crtc_prepare_pll(struct drm_crtc *crtc, struct drm_display_
radeon_atombios_get_ppll_ss_info(rdev,
&radeon_crtc->ss,
ATOM_DP_SS_ID1);
- } else
+ } else {
radeon_crtc->ss_enabled =
radeon_atombios_get_ppll_ss_info(rdev,
&radeon_crtc->ss,
ATOM_DP_SS_ID1);
+ }
+ /* disable spread spectrum on DCE3 DP */
+ radeon_crtc->ss_enabled = false;
}
break;
case ATOM_ENCODER_MODE_LVDS: