| From 5099fa7f23d3711538cbe9fe072b4ce1ba814035 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexdeucher@gmail.com> |
| Date: Mon, 12 Jul 2010 17:33:50 -0400 |
| Subject: drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740 |
| |
| From: Alex Deucher <alexdeucher@gmail.com> |
| |
| commit 5099fa7f23d3711538cbe9fe072b4ce1ba814035 upstream. |
| |
| Check ulBootUpMemoryClock on AMD IGPs. |
| |
| Fix regression noticed by Torsten Kaiser <just.for.lkml@googlemail.com> |
| |
| Signed-off-by: Alex Deucher <alexdeucher@gmail.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_atombios.c | 11 +++++++++-- |
| 1 file changed, 9 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_atombios.c |
| +++ b/drivers/gpu/drm/radeon/radeon_atombios.c |
| @@ -986,8 +986,15 @@ bool radeon_atombios_sideport_present(st |
| if (igp_info) { |
| switch (crev) { |
| case 1: |
| - if (igp_info->info.ucMemoryType & 0xf0) |
| - return true; |
| + /* AMD IGPS */ |
| + if ((rdev->family == CHIP_RS690) || |
| + (rdev->family == CHIP_RS740)) { |
| + if (igp_info->info.ulBootUpMemoryClock) |
| + return true; |
| + } else { |
| + if (igp_info->info.ucMemoryType & 0xf0) |
| + return true; |
| + } |
| break; |
| case 2: |
| if (igp_info->info_2.ucMemoryType & 0x0f) |
