aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-07-19 17:44:43 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-07-22 15:57:13 -0400
commit03ed8cf9b28d886c64c7e705c7bb1a365fd8fb95 (patch)
treee4da5e99574c69671a985c672bccd447da331109
parentf7929f34fa0e0bb6736a2484fdc07d77a1653081 (diff)
drm/radeon: improve dac adjust heuristics for legacy pdac
Hopefully avoid more quirks in the future due to bogus vbios dac data. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/radeon/radeon_combios.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 8528b81cd64f..485f82c9929d 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -965,8 +965,10 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct
965 dac = RBIOS8(dac_info + 0x3) & 0xf; 965 dac = RBIOS8(dac_info + 0x3) & 0xf;
966 p_dac->ps2_pdac_adj = (bg << 8) | (dac); 966 p_dac->ps2_pdac_adj = (bg << 8) | (dac);
967 } 967 }
968 /* if the values are all zeros, use the table */ 968 /* if the values are zeros, use the table */
969 if (p_dac->ps2_pdac_adj) 969 if ((dac == 0) || (bg == 0))
970 found = 0;
971 else
970 found = 1; 972 found = 1;
971 } 973 }
972 974