summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2012-10-24 18:29:49 +0200
committerBen Hutchings <ben@decadent.org.uk>2012-11-16 16:47:07 +0000
commit2934c2b2710d91472eda799de71b51571417cd59 (patch)
treeb62e502482e98c857b2b6817cccc18270e160f1b /drivers
parent620cc1df7f260855bfa05f56483ced4be702d57b (diff)
DRM/Radeon: Fix Load Detection on legacy primary DAC.
commit 83325d072185899b706de2956170b246585aaec9 upstream. 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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 3ad3cc62d573..816595396015 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -650,6 +650,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);