summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2012-10-24 18:29:49 +0200
committerAlex Deucher <alexander.deucher@amd.com>2012-11-01 15:34:16 +0100
commit83325d072185899b706de2956170b246585aaec9 (patch)
treeaa295d37cd7d4db13f7549fef87f16d9038276ff /drivers
parentMerge branch 'drm-nouveau-fixes' of git://people.freedesktop.org/git/nouveau/... (diff)
downloadlinux-83325d072185899b706de2956170b246585aaec9.tar.xz
linux-83325d072185899b706de2956170b246585aaec9.zip
DRM/Radeon: Fix Load Detection on legacy primary DAC.
An uninitialized variable led to broken load detection. Signed-off-by: Egbert Eich <eich@suse.de> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/radeon_legacy_encoders.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index 0063df9d166d..f278f20ea12a 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -671,6 +671,7 @@ static enum drm_connector_status radeon_legacy_primary_dac_detect(struct drm_enc
tmp |= RADEON_DAC_RANGE_CNTL_PS2 | RADEON_DAC_CMP_EN;
WREG32(RADEON_DAC_CNTL, tmp);
+ tmp = dac_macro_cntl;
tmp &= ~(RADEON_DAC_PDWN_R |
RADEON_DAC_PDWN_G |
RADEON_DAC_PDWN_B);