From: Marcin Kościelnicki <koriakin@0x04.net>
Date: Mon, 14 Dec 2009 20:38:17 +0000 (+0000)
Subject: drm/nv04: Fix NV04 set_operation software method.
X-Git-Tag: v2.6.33-rc2~19^2~1^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13c5443b515109f175bb9917c578a7ae973f6851;p=profile%2Fcommon%2Fkernel-common.git

drm/nv04: Fix NV04 set_operation software method.

Signed-off-by: Marcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
index 396ee92..d561d77 100644
--- a/drivers/gpu/drm/nouveau/nv04_graph.c
+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
@@ -543,7 +543,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass,
 
 	nv_wi32(dev, instance, tmp);
 	nv_wr32(dev, NV04_PGRAPH_CTX_SWITCH1, tmp);
-	nv_wr32(dev, NV04_PGRAPH_CTX_CACHE1 + subc, tmp);
+	nv_wr32(dev, NV04_PGRAPH_CTX_CACHE1 + (subc<<2), tmp);
 	return 0;
 }