From 613abe4777cfc8c65d951d09dde29ffae9e8ff47 Mon Sep 17 00:00:00 2001
From: Roy Spliet <r.spliet@student.tudelft.nl>
Date: Wed, 9 Jan 2013 03:40:33 +0100
Subject: [PATCH] --- yaml --- r: 349695 b: refs/heads/master c:
 526810adb93554e17bdb83023a01cfa8758960b2 h: refs/heads/master i:   349693:
 2bfec32708fc0841356ed6697e556cdad1b20dcc   349691:
 aa76edae69c7bc0533c183e7ba3c9a154eeb2f5c   349687:
 57a7922b3ee0178991b9eb8a7063c649b3f6069a   349679:
 00d9833e2af64b12ec146fea51f472323d04eeca   349663:
 23c84be3f91f62a52b3004ee9fefcfe26e9934dc   349631:
 1dc92fb4c189fb40e2196636be3d9b508dbd642e   349567:
 f1ecf23762b73251582c78d2a69a24d183b6daca   349439:
 3142730a9a812c45f0c7c85da38f1b492b057ba2   349183:
 07a3f5bb552b9087b620dd2fdcc786ea3130344f v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/base.c | 4 ++--
 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8b683c907802..ab1eb7aecd7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e98380cbd3894de2b3c1ea182d62e946555f7d0
+refs/heads/master: 526810adb93554e17bdb83023a01cfa8758960b2
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/base.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/base.c
index d6d16007ec1a..d62045f454b2 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/base.c
+++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/base.c
@@ -86,8 +86,8 @@ nouveau_fb_preinit(struct nouveau_fb *pfb)
 			return ret;
 	}
 
-	if (!nouveau_mm_initialised(&pfb->tags) && tags) {
-		ret = nouveau_mm_init(&pfb->tags, 0, ++tags, 1);
+	if (!nouveau_mm_initialised(&pfb->tags)) {
+		ret = nouveau_mm_init(&pfb->tags, 0, tags ? ++tags : 0, 1);
 		if (ret)
 			return ret;
 	}
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
index 487cb8c6c204..eac236ed19b2 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
+++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
@@ -99,7 +99,7 @@ nv50_fb_vram_init(struct nouveau_fb *pfb)
 	struct nouveau_bios *bios = nouveau_bios(device);
 	const u32 rsvd_head = ( 256 * 1024) >> 12; /* vga memory */
 	const u32 rsvd_tail = (1024 * 1024) >> 12; /* vbios etc */
-	u32 size;
+	u32 size, tags = 0;
 	int ret;
 
 	pfb->ram.size = nv_rd32(pfb, 0x10020c);
@@ -140,10 +140,11 @@ nv50_fb_vram_init(struct nouveau_fb *pfb)
 			return ret;
 
 		pfb->ram.ranks = (nv_rd32(pfb, 0x100200) & 0x4) ? 2 : 1;
+		tags = nv_rd32(pfb, 0x100320);
 		break;
 	}
 
-	return nv_rd32(pfb, 0x100320);
+	return tags;
 }
 
 static int