Skip to content

Commit

Permalink
drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Deucher authored and Dave Airlie committed Jul 13, 2010
1 parent ff3f011 commit 5099fa7
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/gpu/drm/radeon/radeon_atombios.c
Original file line number Diff line number Diff line change
@@ -1029,8 +1029,15 @@ bool radeon_atombios_sideport_present(struct radeon_device *rdev)
data_offset);
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)

0 comments on commit 5099fa7

Please sign in to comment.