summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs2010-07-12 05:45:51 +0200
committerBen Skeggs2010-07-13 02:14:02 +0200
commitca6adb8a217fc2a6f20a50b400ba676481a90945 (patch)
tree6983bdf3c5b958f28ecc92f3786482582e8d87b7
parentdrm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch (diff)
downloadkernel-qcow2-linux-ca6adb8a217fc2a6f20a50b400ba676481a90945.tar.gz
kernel-qcow2-linux-ca6adb8a217fc2a6f20a50b400ba676481a90945.tar.xz
kernel-qcow2-linux-ca6adb8a217fc2a6f20a50b400ba676481a90945.zip
drm/nv50: fix RAMHT size
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv50_fifo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
index c4467b04cf1d..fb0281ae8f90 100644
--- a/drivers/gpu/drm/nouveau/nv50_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
@@ -259,7 +259,9 @@ nv50_fifo_create_context(struct nouveau_channel *chan)
spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
nv_wo32(dev, ramfc, 0x48/4, chan->pushbuf->instance >> 4);
- nv_wo32(dev, ramfc, 0x80/4, (0xc << 24) | (chan->ramht->instance >> 4));
+ nv_wo32(dev, ramfc, 0x80/4, (0 << 27) /* 4KiB */ |
+ (4 << 24) /* SEARCH_FULL */ |
+ (chan->ramht->instance >> 4));
nv_wo32(dev, ramfc, 0x44/4, 0x2101ffff);
nv_wo32(dev, ramfc, 0x60/4, 0x7fffffff);
nv_wo32(dev, ramfc, 0x40/4, 0x00000000);