drm/radeon/kms: don't crash if no DDC bus on VGA/DVI connector.
Subsystems (2)
Dave Airlie
maintainerPATCH 1/2 drm/radeon/kms: don't crash if no DDC bus on VGA/DVI connector.
From: Dave Airlie <[email protected]>
This is strange - like really really strange, twilight zone of strange. VGA ports have DDC buses, but sometimes for some reasons the BIOS says we don't and we oops - AMD mentioned bios bugs so we'll have to add quirks.
reported on irc by nirbheek and
https://bugzilla.redhat.com/show_bug.cgi?id=554323
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/radeon/radeon_connectors.c | 20 ++++++++++++-------- drivers/gpu/drm/radeon/radeon_display.c | 11 ++++++++++- 2 files changed, 22 insertions(+), 9 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +12 -8
@@ -580,16 +580,18 @@ static enum drm_connector_status radeon_vga_detect(struct drm_connector *connectstruct radeon_connector *radeon_connector =to_radeon_connector (connector);struct drm_encoder *encoder;struct drm_encoder_helper_funcs *encoder_funcs; -bool dret; +bool dret = false;enum drm_connector_status ret = connector_status_disconnected; encoder =radeon_best_single_encoder (connector);if (!encoder) ret = connector_status_disconnected; -radeon_i2c_do_lock (radeon_connector->ddc_bus,1 ); - dret =radeon_ddc_probe (radeon_connector); -radeon_i2c_do_lock (radeon_connector->ddc_bus,0 ); +if (radeon_connector->ddc_bus) { +radeon_i2c_do_lock (radeon_connector->ddc_bus,1 ); + dret =radeon_ddc_probe (radeon_connector); +radeon_i2c_do_lock (radeon_connector->ddc_bus,0 ); + }if (dret) {if (radeon_connector->edid) {kfree (radeon_connector->edid);
@@ -740,11 +742,13 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connectstruct drm_mode_object *obj;int i;enum drm_connector_status ret = connector_status_disconnected; -bool dret; +bool dret = false; -radeon_i2c_do_lock (radeon_connector->ddc_bus,1 ); - dret =radeon_ddc_probe (radeon_connector); -radeon_i2c_do_lock (radeon_connector->ddc_bus,0 ); +if (radeon_connector->ddc_bus) { +radeon_i2c_do_lock (radeon_connector->ddc_bus,1 ); + dret =radeon_ddc_probe (radeon_connector); +radeon_i2c_do_lock (radeon_connector->ddc_bus,0 ); + }if (dret) {if (radeon_connector->edid) {kfree (radeon_connector->edid);
drivers/gpu/drm/radeon/radeon_display.c +10 -1
@@ -278,7 +278,7 @@ static void radeon_print_display_setup(struct drm_device *dev)DRM_INFO (" %s\n" , connector_names[connector->connector_type]);if (radeon_connector->hpd.hpd !=RADEON_HPD_NONE )DRM_INFO (" %s\n" , hpd_names[radeon_connector->hpd.hpd]); -if (radeon_connector->ddc_bus) +if (radeon_connector->ddc_bus) { DRM_INFO(" DDC: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", radeon_connector->ddc_bus->rec.mask_clk_reg, radeon_connector->ddc_bus->rec.mask_data_reg,
@@ -288,6 +288,15 @@ static void radeon_print_display_setup(struct drm_device *dev) radeon_connector->ddc_bus->rec.en_data_reg, radeon_connector->ddc_bus->rec.y_clk_reg, radeon_connector->ddc_bus->rec.y_data_reg); + }else { +if (connector->connector_type ==DRM_MODE_CONNECTOR_VGA || + connector->connector_type ==DRM_MODE_CONNECTOR_DVII || + connector->connector_type ==DRM_MODE_CONNECTOR_DVID || + connector->connector_type ==DRM_MODE_CONNECTOR_DVIA || + connector->connector_type ==DRM_MODE_CONNECTOR_HDMIA || + connector->connector_type ==DRM_MODE_CONNECTOR_HDMIB ) +DRM_INFO (" DDC: no ddc bus - possible BIOS bug - please report to [email protected]\n" ); + }DRM_INFO (" Encoders:\n" );list_for_each_entry (encoder, &dev->mode_config.encoder_list, head) { radeon_encoder =to_radeon_encoder (encoder);
Signature · 10 lines
1.6.5.2 ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com --
Dave Airlie
maintainerPATCH 2/2 drm/radeon/kms: add quirk for VGA without DDC on rv730 XFX card.
From: Dave Airlie <[email protected]>
Reported on irc by nirbheek.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/radeon/radeon_atombios.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_atombios.c +9 -0
@@ -287,6 +287,15 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, *connector_type =DRM_MODE_CONNECTOR_DVID ; } +/* XFX Pine Group device rv730 reports no VGA DDC lines +* even though they are wired up to record 0x93 +*/ +if ((dev->pdev->device ==0x9498 ) && + (dev->pdev->subsystem_vendor ==0x1682 ) && + (dev->pdev->subsystem_device ==0x2452 )) { +struct radeon_device *rdev = dev->dev_private; + *i2c_bus =radeon_lookup_i2c_gpio (rdev,0x93 ); + }return true; }
Signature · 10 lines
1.6.5.2 ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com --