diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-09-30 14:17:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-09-30 14:17:27 +1000 |
| commit | 7b3aa626482963cc52086da629f682fce2c7322c (patch) | |
| tree | 33d831aad91d52b2c90b6345eb90339a141a97a4 /linux-core/radeon_atombios.c | |
| parent | 972f6572652bc4a2f6c44c525e5e91f2becdb62a (diff) | |
| parent | 9c6732e790b123bebab0a6d05c592598f9cd2327 (diff) | |
Merge remote branch 'origin/modesetting-gem' into modesetting-gem
Diffstat (limited to 'linux-core/radeon_atombios.c')
| -rw-r--r-- | linux-core/radeon_atombios.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux-core/radeon_atombios.c b/linux-core/radeon_atombios.c index 90a367a0..a763e766 100644 --- a/linux-core/radeon_atombios.c +++ b/linux-core/radeon_atombios.c @@ -277,8 +277,10 @@ bool radeon_get_atom_connector_info_from_bios_connector_table(struct drm_device union atom_supported_devices *supported_devices; int i,j; - if (radeon_get_atom_connector_info_from_bios_object_table(dev)) - return true; + if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) + // FIXME this should return false for pre-r6xx chips + if (radeon_get_atom_connector_info_from_bios_object_table(dev)) + return true; atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); |