From dfbe6592afdbc05e82c1382fe44bb2daa0560426 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 1 Feb 2012 09:05:42 +1000 Subject: [PATCH] --- yaml --- r: 293755 b: refs/heads/master c: 950c44b6ddc0dfb44e59fdb031e09567a1b391c0 h: refs/heads/master i: 293753: 0c7e6c4b6748affe412157e3a35c657deb015133 293751: 80320c20deb34c2c12e22d7778e98d6d8a6c0862 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_vram.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cf623dfdf789..2f4149e4b11b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df26bc9c320602539b1b5b3d85786e4c8de7bf43 +refs/heads/master: 950c44b6ddc0dfb44e59fdb031e09567a1b391c0 diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_vram.c b/trunk/drivers/gpu/drm/nouveau/nvc0_vram.c index fd687ee888de..82b51b2506ab 100644 --- a/trunk/drivers/gpu/drm/nouveau/nvc0_vram.c +++ b/trunk/drivers/gpu/drm/nouveau/nvc0_vram.c @@ -116,6 +116,7 @@ nvc0_vram_init(struct drm_device *dev) NV_DEBUG(dev, "parts 0x%08x bcast_mem_amount 0x%08x\n", parts, bsize); dev_priv->vram_type = nouveau_mem_vbios_type(dev); + dev_priv->vram_rank_B = !!(nv_rd32(dev, 0x10f200) & 0x00000004); /* read amount of vram attached to each memory controller */ part = 0;