From: Marcin Kościelnicki Date: Sun, 10 Jan 2010 17:09:14 +0000 (+0000) Subject: drm/nv04: Fix set_operation software method. X-Git-Tag: v2.6.33-rc4~17^2^2 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=40c2298bdcc8b766a39964c44e9a74d16aa95d53;p=safe%2Fjmp%2Flinux-2.6 drm/nv04: Fix set_operation software method. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c index 98f3b40..e260986 100644 --- a/drivers/gpu/drm/nouveau/nv04_graph.c +++ b/drivers/gpu/drm/nouveau/nv04_graph.c @@ -537,7 +537,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass, int mthd, uint32_t data) { struct drm_device *dev = chan->dev; - uint32_t instance = nv_rd32(dev, NV04_PGRAPH_CTX_SWITCH4) & 0xffff; + uint32_t instance = (nv_rd32(dev, NV04_PGRAPH_CTX_SWITCH4) & 0xffff) << 4; int subc = (nv_rd32(dev, NV04_PGRAPH_TRAPPED_ADDR) >> 13) & 0x7; uint32_t tmp;