From 107b99b776b4d01f9cba1474e3c1ddb5a787c7d5 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 12 Jul 2010 17:33:50 -0400
Subject: [PATCH] --- yaml --- r: 201111 b: refs/heads/master c:
 5099fa7f23d3711538cbe9fe072b4ce1ba814035 h: refs/heads/master i:   201109:
 08f48b61f828189540a0f48f940c135685db0c47   201107:
 71b979ea0762636a62ae58601f7476e7ee30411e   201103:
 8f4982eca760d8dd99f01f6bb087e10c00f4f73a v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/gpu/drm/radeon/radeon_atombios.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bc415a56265b..689ad43dbc20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff3f011cd859072b5d6e64c0b968cff9bfdc0b37
+refs/heads/master: 5099fa7f23d3711538cbe9fe072b4ce1ba814035
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_atombios.c b/trunk/drivers/gpu/drm/radeon/radeon_atombios.c
index 99bd8a9c56b3..125155af8881 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/trunk/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)