From 0267af7910e8dd86b6d35e62510e7461c3c515af Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 8 Jun 2010 13:04:50 +1000 Subject: [PATCH] --- yaml --- r: 200243 b: refs/heads/master c: d294ed69408b54c18f0420516ea057b2a734624d h: refs/heads/master i: 200241: 9db44e414d63e927c62c21ec41a67de54e70bc07 200239: d61a1998cf747b9b81790015e674d8cfc5a23bf3 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2962094e295e..42c2669baa13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eb3033c72099fab3536ed8ac54a5dc99f0832d7 +refs/heads/master: d294ed69408b54c18f0420516ea057b2a734624d diff --git a/trunk/drivers/gpu/drm/radeon/radeon_combios.c b/trunk/drivers/gpu/drm/radeon/radeon_combios.c index f6f907e7217a..1bee2f9e24a5 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_combios.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_combios.c @@ -2026,6 +2026,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev) combios_setup_i2c_bus(rdev, RADEON_GPIO_CRT2_DDC); break; default: + ddc_i2c.valid = false; break; } @@ -2339,6 +2340,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev) if (RBIOS8(tv_info + 6) == 'T') { if (radeon_apply_legacy_tv_quirks(dev)) { hpd.hpd = RADEON_HPD_NONE; + ddc_i2c.valid = false; radeon_add_legacy_encoder(dev, radeon_get_encoder_id (dev,