From 2e3abb4b109e338c9019ffd23158dac8d0ae5944 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 7 Oct 2011 16:00:31 +1000 Subject: [PATCH] --- yaml --- r: 275269 b: refs/heads/master c: 7b4b98fa0c4d3a975b36bfe9984e4cd117f2ddff h: refs/heads/master i: 275267: 7ea93d53dbffdff7a7304650aa6bc3741e4c125d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_vram.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 939a79ad14a3..396281b7b89f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dce411cdf60eb64638443f953b52c18192378305 +refs/heads/master: 7b4b98fa0c4d3a975b36bfe9984e4cd117f2ddff diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_vram.c b/trunk/drivers/gpu/drm/nouveau/nv50_vram.c index 9da23838e63e..2e45e57fd869 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_vram.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_vram.c @@ -160,7 +160,7 @@ nv50_vram_rblock(struct drm_device *dev) colbits = (r4 & 0x0000f000) >> 12; rowbitsa = ((r4 & 0x000f0000) >> 16) + 8; rowbitsb = ((r4 & 0x00f00000) >> 20) + 8; - banks = ((r4 & 0x01000000) ? 8 : 4); + banks = 1 << (((r4 & 0x03000000) >> 24) + 2); rowsize = parts * banks * (1 << colbits) * 8; predicted = rowsize << rowbitsa;