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: Ubuntu-5.0.0-8.9~24393^2~11^2~14 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fe5a64acbfab4f79ccd18972c3d4c1cae31f3b8d;p=mirror_ubuntu-disco-kernel.git 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 98f3b40318d4..e260986ea65a 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;