aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_combios.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-05-18 19:26:47 -0400
committerDave Airlie <airlied@redhat.com>2010-05-18 20:31:41 -0400
commit8e36ed00842668a39a6ed1b0a00b8ac92b7c4cd5 (patch)
treeb16da6957fdfbea44ef4cdd540a13d4be59c9445 /drivers/gpu/drm/radeon/radeon_combios.c
parent2bfcc0fc698d550689ef020c73b2d977b73e728c (diff)
drm/radeon/kms: hpd cleanup
- Use radeon hpd enum consistently (in both hotplug and dp) - Legacy r100 with DVI should be HPD_1 not NONE Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_combios.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_combios.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 93f18bbf744a..7b5e10d3e9c9 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -600,7 +600,7 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde
600 } 600 }
601 i2c.mm_i2c = false; 601 i2c.mm_i2c = false;
602 i2c.i2c_id = 0; 602 i2c.i2c_id = 0;
603 i2c.hpd_id = 0; 603 i2c.hpd = RADEON_HPD_NONE;
604 604
605 if (ddc_line) 605 if (ddc_line)
606 i2c.valid = true; 606 i2c.valid = true;
@@ -2198,7 +2198,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev)
2198 ATOM_DEVICE_DFP1_SUPPORT); 2198 ATOM_DEVICE_DFP1_SUPPORT);
2199 2199
2200 ddc_i2c = combios_setup_i2c_bus(rdev, RADEON_GPIO_DVI_DDC); 2200 ddc_i2c = combios_setup_i2c_bus(rdev, RADEON_GPIO_DVI_DDC);
2201 hpd.hpd = RADEON_HPD_NONE; 2201 hpd.hpd = RADEON_HPD_1;
2202 radeon_add_legacy_connector(dev, 2202 radeon_add_legacy_connector(dev,
2203 0, 2203 0,
2204 ATOM_DEVICE_CRT1_SUPPORT | 2204 ATOM_DEVICE_CRT1_SUPPORT |