diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-07-12 17:33:50 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-07-13 19:08:36 -0400 |
commit | 5099fa7f23d3711538cbe9fe072b4ce1ba814035 (patch) | |
tree | 5c87fe0cf8fc9ec50289f2705a3934a040b58b46 /drivers | |
parent | ff3f011cd859072b5d6e64c0b968cff9bfdc0b37 (diff) |
drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740
Check ulBootUpMemoryClock on AMD IGPs.
Fix regression noticed by Torsten Kaiser <just.for.lkml@googlemail.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 99bd8a9c56b..125155af888 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |||
@@ -1029,8 +1029,15 @@ bool radeon_atombios_sideport_present(struct radeon_device *rdev) | |||
1029 | data_offset); | 1029 | data_offset); |
1030 | switch (crev) { | 1030 | switch (crev) { |
1031 | case 1: | 1031 | case 1: |
1032 | if (igp_info->info.ucMemoryType & 0xf0) | 1032 | /* AMD IGPS */ |
1033 | return true; | 1033 | if ((rdev->family == CHIP_RS690) || |
1034 | (rdev->family == CHIP_RS740)) { | ||
1035 | if (igp_info->info.ulBootUpMemoryClock) | ||
1036 | return true; | ||
1037 | } else { | ||
1038 | if (igp_info->info.ucMemoryType & 0xf0) | ||
1039 | return true; | ||
1040 | } | ||
1034 | break; | 1041 | break; |
1035 | case 2: | 1042 | case 2: |
1036 | if (igp_info->info_2.ucMemoryType & 0x0f) | 1043 | if (igp_info->info_2.ucMemoryType & 0x0f) |