diff options
author | Dave Airlie <airlied@redhat.com> | 2010-06-07 23:04:50 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-06-08 01:16:44 -0400 |
commit | d294ed69408b54c18f0420516ea057b2a734624d (patch) | |
tree | f701f77a6430c5ab88107fea3dba5193a183d7db | |
parent | 4eb3033c72099fab3536ed8ac54a5dc99f0832d7 (diff) |
drm/radeon: reset i2c valid to avoid incorrect tv-out polling.
We really don't want to be polling tv-out but since we weren't forcing the
i2c lines to invalid (tv-out has no DDC), we were adding tv connectors to the
polling setup and this was causing blinking on secondary displays.
This fixes the regression Torsten reported.
Reported-by: Torsten Kaiser <just.for.lkml@googlemail.com>
Tested-by: Torsten Kaiser <just.for.lkml@googlemail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index f6f907e7217a..1bee2f9e24a5 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |||
@@ -2026,6 +2026,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev) | |||
2026 | combios_setup_i2c_bus(rdev, RADEON_GPIO_CRT2_DDC); | 2026 | combios_setup_i2c_bus(rdev, RADEON_GPIO_CRT2_DDC); |
2027 | break; | 2027 | break; |
2028 | default: | 2028 | default: |
2029 | ddc_i2c.valid = false; | ||
2029 | break; | 2030 | break; |
2030 | } | 2031 | } |
2031 | 2032 | ||
@@ -2339,6 +2340,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev) | |||
2339 | if (RBIOS8(tv_info + 6) == 'T') { | 2340 | if (RBIOS8(tv_info + 6) == 'T') { |
2340 | if (radeon_apply_legacy_tv_quirks(dev)) { | 2341 | if (radeon_apply_legacy_tv_quirks(dev)) { |
2341 | hpd.hpd = RADEON_HPD_NONE; | 2342 | hpd.hpd = RADEON_HPD_NONE; |
2343 | ddc_i2c.valid = false; | ||
2342 | radeon_add_legacy_encoder(dev, | 2344 | radeon_add_legacy_encoder(dev, |
2343 | radeon_get_encoder_id | 2345 | radeon_get_encoder_id |
2344 | (dev, | 2346 | (dev, |