summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2014-06-07 15:39:45 -0400
committerBen Skeggs <bskeggs@redhat.com>2014-06-11 16:02:07 +1000
commit64db56233cd5edc68bdb1c7084b7a4eaa0ead00f (patch)
tree7e2bb742ab8668424e246ddaad98abc7b9deba47
parentdbe2d9fe755ad3aec0c82a270bf54aa118a34a17 (diff)
gr/gk208: add missing registers to grctx init
This fixes hangs on GK208 which happen instantaneously on trying to use a geometry shader. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Cc: stable@vger.kernel.org # v3.14+
-rw-r--r--nvkm/engine/graph/ctxnv108.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/nvkm/engine/graph/ctxnv108.c b/nvkm/engine/graph/ctxnv108.c
index 48351b4d..8de4a429 100644
--- a/nvkm/engine/graph/ctxnv108.c
+++ b/nvkm/engine/graph/ctxnv108.c
@@ -545,10 +545,12 @@ nv108_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
mmio_list(0x408010, 0x80000000, 0, 0);
mmio_list(0x419004, 0x00000000, 8, 1);
mmio_list(0x419008, 0x00000000, 0, 0);
+ mmio_list(0x4064cc, 0x80000000, 0, 0);
mmio_list(0x408004, 0x00000000, 8, 0);
mmio_list(0x408008, 0x80000030, 0, 0);
mmio_list(0x418808, 0x00000000, 8, 0);
mmio_list(0x41880c, 0x80000030, 0, 0);
+ mmio_list(0x4064c8, 0x00c20200, 0, 0);
mmio_list(0x418810, 0x80000000, 12, 2);
mmio_list(0x419848, 0x10000000, 12, 2);