From 0b642d1f9bad4a0957fb24c293896ae04574e9d5 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 22 Oct 2012 13:40:36 +1000 Subject: [PATCH] --- yaml --- r: 334720 b: refs/heads/master c: 2c25b7399570ebdcf737c5af67c9d26a1771c002 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 94a3eabde6e3..178522e7c257 100644 --- 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 index 42d7539e6525..27fb1af7a779 100644 --- 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,