diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2010-01-10 17:09:14 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-11 14:41:19 +1000 |
| commit | 40c2298bdcc8b766a39964c44e9a74d16aa95d53 (patch) | |
| tree | e3da8a0aa4cf15e256add5b742c7df6d6a2064be /drivers/gpu | |
| parent | c63834e1db41b59d6c7bfb1d2a549c027a42a877 (diff) | |
| download | op-kernel-dev-40c2298bdcc8b766a39964c44e9a74d16aa95d53.zip op-kernel-dev-40c2298bdcc8b766a39964c44e9a74d16aa95d53.tar.gz | |
drm/nv04: Fix set_operation software method.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |
