diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2013-07-19 17:44:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 04:51:09 -0400 |
commit | d54b22e585edd4401786e7c02cd85bc97fff5ffb (patch) | |
tree | 32e6835a78bcb92e2dd9ba4e512b081504a4db02 | |
parent | 405a7ccac881355809e07a4f00e0e8528ee7cec5 (diff) |
drm/radeon: improve dac adjust heuristics for legacy pdac
commit 03ed8cf9b28d886c64c7e705c7bb1a365fd8fb95 upstream.
Hopefully avoid more quirks in the future due to bogus
vbios dac data.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 6 |
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 94303840f650..68ce36056019 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |||
@@ -902,8 +902,10 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct | |||
902 | dac = RBIOS8(dac_info + 0x3) & 0xf; | 902 | dac = RBIOS8(dac_info + 0x3) & 0xf; |
903 | p_dac->ps2_pdac_adj = (bg << 8) | (dac); | 903 | p_dac->ps2_pdac_adj = (bg << 8) | (dac); |
904 | } | 904 | } |
905 | /* if the values are all zeros, use the table */ | 905 | /* if the values are zeros, use the table */ |
906 | if (p_dac->ps2_pdac_adj) | 906 | if ((dac == 0) || (bg == 0)) |
907 | found = 0; | ||
908 | else | ||
907 | found = 1; | 909 | found = 1; |
908 | } | 910 | } |
909 | 911 | ||