From 014d90bacc18f3b840c8c6cafd3ea94df58de8fa Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 12 Jul 2010 13:45:51 +1000 Subject: [PATCH] --- yaml --- r: 205083 b: refs/heads/master c: ca6adb8a217fc2a6f20a50b400ba676481a90945 h: refs/heads/master i: 205081: c5548447eabe1c4e53ae4aba980fdb70e0b982a4 205079: d37c90622634c7403fae8318f0656f02e983e4cc v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_fifo.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b16519dad0d2..c3b08f9aefdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41090eb4243bef2e90159b2a6acdc671ad0f825b +refs/heads/master: ca6adb8a217fc2a6f20a50b400ba676481a90945 diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_fifo.c b/trunk/drivers/gpu/drm/nouveau/nv50_fifo.c index c4467b04cf1d..fb0281ae8f90 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_fifo.c +++ b/trunk/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);