---

yaml --- r: 334720 b: refs/heads/master c: 2c25b73 h: refs/heads/master v: v3
git-mirror · Oct 22, 2012 · 0b642d1 · 0b642d1
1 parent f093f31
commit 0b642d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bf24c02150a4c5e31d397342b1157496f1881ee
+refs/heads/master: 2c25b7399570ebdcf737c5af67c9d26a1771c002
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
@@ -237,6 +237,7 @@ nv50_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 			return ret;
 
 		priv->base.ram.stolen = (u64)nv_rd32(priv, 0x100e10) << 12;
+		priv->base.ram.type = NV_MEM_TYPE_STOLEN;
 		break;
 	default:
 		ret = nouveau_mm_init(&priv->base.vram, rsvd_head, size,