diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2010-01-10 12:09:14 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-10 23:41:19 -0500 |
| commit | 40c2298bdcc8b766a39964c44e9a74d16aa95d53 (patch) | |
| tree | e3da8a0aa4cf15e256add5b742c7df6d6a2064be /drivers/gpu | |
| parent | c63834e1db41b59d6c7bfb1d2a549c027a42a877 (diff) | |
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 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, | |||
| 537 | int mthd, uint32_t data) | 537 | int mthd, uint32_t data) |
| 538 | { | 538 | { |
| 539 | struct drm_device *dev = chan->dev; | 539 | struct drm_device *dev = chan->dev; |
| 540 | uint32_t instance = nv_rd32(dev, NV04_PGRAPH_CTX_SWITCH4) & 0xffff; | 540 | uint32_t instance = (nv_rd32(dev, NV04_PGRAPH_CTX_SWITCH4) & 0xffff) << 4; |
| 541 | int subc = (nv_rd32(dev, NV04_PGRAPH_TRAPPED_ADDR) >> 13) & 0x7; | 541 | int subc = (nv_rd32(dev, NV04_PGRAPH_TRAPPED_ADDR) >> 13) & 0x7; |
| 542 | uint32_t tmp; | 542 | uint32_t tmp; |
| 543 | 543 | ||