projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c63834e
)
drm/nv04: Fix set_operation software method.
author
Marcin KoĆcielnicki
<koriakin@0x04.net>
Sun, 10 Jan 2010 17:09:14 +0000
(17:09 +0000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 11 Jan 2010 04:41:19 +0000
(14:41 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv04_graph.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv04_graph.c
b/drivers/gpu/drm/nouveau/nv04_graph.c
index 98f3b40318d4fcf06e4890d818eae34132d46e8b..e260986ea65af09281dc72dea034f1e975490b40 100644
(file)
--- 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;