diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2010-01-10 12:09:14 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-01-10 18:06:53 -0500 |
| commit | fe5a64acbfab4f79ccd18972c3d4c1cae31f3b8d (patch) | |
| tree | 0660f558cd77b534f15d07d4bbe14a7d94e814fe | |
| parent | 75c99da6cdd0ec9d70747f9ced3e85b2dd955cdf (diff) | |
drm/nv04: Fix set_operation software method.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -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 | ||