From a4a3b9959ffca85f1c7da80412d047ef879346b8 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 13 Dec 2011 12:46:18 +1000 Subject: [PATCH] --- yaml --- r: 293726 b: refs/heads/master c: f3298532f71f163877b9003009d6e1eefe988258 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_vram.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fc63a10d6980..0c7b16e5e8b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c70c41e89f0481f26749d8264aebc594566c2a6d +refs/heads/master: f3298532f71f163877b9003009d6e1eefe988258 diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_vram.c b/trunk/drivers/gpu/drm/nouveau/nvc0_vram.c index ce984d573a51..fd687ee888de 100644 --- a/trunk/drivers/gpu/drm/nouveau/nvc0_vram.c +++ b/trunk/drivers/gpu/drm/nouveau/nvc0_vram.c @@ -115,6 +115,8 @@ nvc0_vram_init(struct drm_device *dev) NV_DEBUG(dev, "0x100800: 0x%08x\n", nv_rd32(dev, 0x100800)); NV_DEBUG(dev, "parts 0x%08x bcast_mem_amount 0x%08x\n", parts, bsize); + dev_priv->vram_type = nouveau_mem_vbios_type(dev); + /* read amount of vram attached to each memory controller */ part = 0; while (parts) {