From a173cef63e9dd2ae5f200ed99c3a62a094a3c526 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 5 Feb 2010 13:57:03 +1000
Subject: [PATCH] --- yaml --- r: 180287 b: refs/heads/master c:
 5ff55717674470b96562f931f778c878080755b7 h: refs/heads/master i:   180285:
 7986965562dddd95d8ad2c12ac9242b34e00990e   180283:
 5754b1c3fc79c89497fcfb9dfb7a1ef81fd5a9f9   180279:
 e99257954adab4cb99162eb102b0999552150e13   180271:
 febb6b1222f5ee7aa1f232f7abc7c3ceb618a095   180255:
 89547182fa8099755241d5cb7d1c38cccdfc2d6c   180223:
 d6ecfc0a2658379b0710cf00f231f5a199e10333 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/gpu/drm/radeon/r300.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8731b3709d21..a8c99ede8bc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a17538f93c16f0e15e35dc31eedad87e2d9c5c26
+refs/heads/master: 5ff55717674470b96562f931f778c878080755b7
diff --git a/trunk/drivers/gpu/drm/radeon/r300.c b/trunk/drivers/gpu/drm/radeon/r300.c
index e699e6d053dd..43b55a030b4d 100644
--- a/trunk/drivers/gpu/drm/radeon/r300.c
+++ b/trunk/drivers/gpu/drm/radeon/r300.c
@@ -506,11 +506,14 @@ void r300_vram_info(struct radeon_device *rdev)
 
 	/* DDR for all card after R300 & IGP */
 	rdev->mc.vram_is_ddr = true;
+
 	tmp = RREG32(RADEON_MEM_CNTL);
-	if (tmp & R300_MEM_NUM_CHANNELS_MASK) {
-		rdev->mc.vram_width = 128;
-	} else {
-		rdev->mc.vram_width = 64;
+	tmp &= R300_MEM_NUM_CHANNELS_MASK;
+	switch (tmp) {
+	case 0: rdev->mc.vram_width = 64; break;
+	case 1: rdev->mc.vram_width = 128; break;
+	case 2: rdev->mc.vram_width = 256; break;
+	default:  rdev->mc.vram_width = 128; break;
 	}
 
 	r100_vram_init_sizes(rdev);