diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-07-12 17:33:50 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-14 09:08:36 +1000 |
| commit | 5099fa7f23d3711538cbe9fe072b4ce1ba814035 (patch) | |
| tree | 5c87fe0cf8fc9ec50289f2705a3934a040b58b46 | |
| parent | ff3f011cd859072b5d6e64c0b968cff9bfdc0b37 (diff) | |
| download | op-kernel-dev-5099fa7f23d3711538cbe9fe072b4ce1ba814035.zip op-kernel-dev-5099fa7f23d3711538cbe9fe072b4ce1ba814035.tar.gz | |
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>
| -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 99bd8a9..125155a 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) 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) |
