Skip to content

L
linux-davinci
Commit 40c2298b authored by Marcin Kościelnicki's avatar Marcin Kościelnicki Committed by Dave Airlie
Browse files
Options

drm/nv04: Fix set_operation software method. 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c63834e1
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/gpu/drm/nouveau/nv04_graph.c
View file @ 40c2298b
...@@ -537,7 +537,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass, ...@@ -537,7 +537,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass,
int mthd, uint32_t data) int mthd, uint32_t data)
{ {
struct drm_device *dev = chan->dev; 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; int subc = (nv_rd32(dev, NV04_PGRAPH_TRAPPED_ADDR) >> 13) & 0x7;
uint32_t tmp; uint32_t tmp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment