diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-01-05 00:12:02 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-06 01:31:53 (GMT) |
| commit | b9597a1c6fa6cbc938f14ab6a7fe09047b3a346b (patch) | |
| tree | 546bdedd1a7f7e675e75a6cabc4673a68e750805 | |
| parent | 0786201d8cd0730e72b0e087484dd47cc5f58409 (diff) | |
| download | linux-fsl-qoriq-b9597a1c6fa6cbc938f14ab6a7fe09047b3a346b.tar.xz | |
drm/radeon/kms: fallback to default connector table
if necessary for combios
Some early combios radeon cards don't have a connector
table or dac table in the bios, if they do not, fallback
to the default tables.
Should fix kernel bug 14963.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_display.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index 91d72b7..1fb2f02 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -329,8 +329,11 @@ static bool radeon_setup_enc_conn(struct drm_device *dev) ret = radeon_get_atom_connector_info_from_object_table(dev); else ret = radeon_get_atom_connector_info_from_supported_devices_table(dev); - } else + } else { ret = radeon_get_legacy_connector_info_from_bios(dev); + if (ret == false) + ret = radeon_get_legacy_connector_info_from_table(dev); + } } else { if (!ASIC_IS_AVIVO(rdev)) ret = radeon_get_legacy_connector_info_from_table(dev); |