From e727b78f7c6f0df7d292b9f92ad75b7e6579a37c Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 22 May 2013 11:30:34 -0400
Subject: [PATCH] --- yaml --- r: 376455 b: refs/heads/master c:
 2cf3a4fcc64e5b54a8a3cd793c6c0024b5d8da6c h: refs/heads/master i:   376453:
 a9f0073498ecb052ee589de151c1206892261a5d   376451:
 4f551aaed9c73a81c6d65c6cca1c5b24d45b6cfe   376447:
 8407caa030f392144efd434e9af9a6ab8b79aa56 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_device.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a29cf0e5a055..6196f133fe2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09fb8bd1a63b0f9f15e655c4fe8d047e5d2bf67a
+refs/heads/master: 2cf3a4fcc64e5b54a8a3cd793c6c0024b5d8da6c
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c
index 89cc8166db94..af82c9b6a28b 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_device.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_device.c
@@ -471,6 +471,9 @@ bool radeon_card_posted(struct radeon_device *rdev)
 	    rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE)
 		return false;
 
+	if (ASIC_IS_NODCE(rdev))
+		goto check_memsize;
+
 	/* first check CRTCs */
 	if (ASIC_IS_DCE4(rdev)) {
 		reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) |
@@ -499,6 +502,7 @@ bool radeon_card_posted(struct radeon_device *rdev)
 		}
 	}
 
+check_memsize:
 	/* then check MEM_SIZE, in case the crtcs are off */
 	if (rdev->family >= CHIP_R600)
 		reg = RREG32(R600_CONFIG_MEMSIZE);