diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-10-15 23:38:32 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2009-10-16 18:31:29 +1000 |
commit | d0c403e950d449c8c413a1fbf05dfec45ce03e55 (patch) | |
tree | 9a89bee2cc97f2b54f63d9dd4fe87d4db44d7034 /drivers/gpu | |
parent | 2d152c6ba81c8a7776103b517fa454b8da0419aa (diff) | |
download | op-kernel-dev-d0c403e950d449c8c413a1fbf05dfec45ce03e55.zip op-kernel-dev-d0c403e950d449c8c413a1fbf05dfec45ce03e55.tar.gz |
drm/radeon/kms: fix support for original r100
Original radeon didn't have a connector table in the
bios. Check for the CRT table and if we have one,
add a VGA connector.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 3c402b9..8298c99 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -1773,8 +1773,25 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev) DRM_MODE_CONNECTOR_DVII, &ddc_i2c); } else { - DRM_DEBUG("No connector info found\n"); - return false; + uint16_t crt_info = + combios_get_table_offset(dev, COMBIOS_CRT_INFO_TABLE); + DRM_DEBUG("Found CRT table, assuming VGA connector\n"); + if (crt_info) { + radeon_add_legacy_encoder(dev, + radeon_get_encoder_id(dev, + ATOM_DEVICE_CRT1_SUPPORT, + 1), + ATOM_DEVICE_CRT1_SUPPORT); + ddc_i2c = combios_setup_i2c_bus(RADEON_GPIO_VGA_DDC); + radeon_add_legacy_connector(dev, + 0, + ATOM_DEVICE_CRT1_SUPPORT, + DRM_MODE_CONNECTOR_VGA, + &ddc_i2c); + } else { + DRM_DEBUG("No connector info found\n"); + return false; + } } } |