drm/gf100-/gf: fix a stupid typo, waiting on wrong signal for mmctx

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/com.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/com.fuc
index e148961..e37d810 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/com.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/com.fuc
@@ -228,7 +228,7 @@ mmctx_xfer:
                        and $r11 0x1f
                        cmpu b32 $r11 0x10
                        bra ne #mmctx_fini_wait
-               mov $r10 2                              // DONE_MMCTX
+               mov $r10 5                      // DONE_MMCTX
                call(wait_donez)
                bra #mmctx_done
        mmctx_stop:

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h
index 4fcbeea..3192270 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h
@@ -177,7 +177,7 @@ uint32_t nv108_grgpc_code[] = {
        0xb4f000bb,
        0x10b4b01f,
        0x0af31bf4,
-       0x00b87e02,
+       0x00b87e05,
        0x250ef400,
 /* 0x01d8: mmctx_stop */
        0xb600abc8,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
index afef16c..325cc7b 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
@@ -192,7 +192,7 @@ uint32_t nvc0_grgpc_code[] = {
        0x1fb4f000,
        0xf410b4b0,
        0xa7f0f01b,
-       0xd021f402,
+       0xd021f405,
 /* 0x0223: mmctx_stop */
        0xc82b0ef4,
        0xb4b600ab,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvd7.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvd7.fuc.h
index 696acf7..d1504a4 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvd7.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvd7.fuc.h
@@ -196,7 +196,7 @@ uint32_t nvd7_grgpc_code[] = {
        0x1fb4f000,
        0xf410b4b0,
        0xa7f0f01b,
-       0xd021f402,
+       0xd021f405,
 /* 0x0223: mmctx_stop */
        0xc82b0ef4,
        0xb4b600ab,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h
index 0cde701..855b220 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h
@@ -196,7 +196,7 @@ uint32_t nve0_grgpc_code[] = {
        0x1fb4f000,
        0xf410b4b0,
        0xa7f0f01b,
-       0xd021f402,
+       0xd021f405,
 /* 0x0223: mmctx_stop */
        0xc82b0ef4,
        0xb4b600ab,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvf0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvf0.fuc.h
index 37475fd..1b80319 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvf0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvf0.fuc.h
@@ -196,7 +196,7 @@ uint32_t nvf0_grgpc_code[] = {
        0x1fb4f000,
        0xf410b4b0,
        0xa7f0f01b,
-       0xd021f402,
+       0xd021f405,
 /* 0x0223: mmctx_stop */
        0xc82b0ef4,
        0xb4b600ab,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h
index 4750984..64dfd75 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h
@@ -342,7 +342,7 @@ uint32_t nv108_grhub_code[] = {
        0xb4f000bb,
        0x10b4b01f,
        0x0af31bf4,
-       0x00b87e02,
+       0x00b87e05,
        0x250ef400,
 /* 0x01d8: mmctx_stop */
        0xb600abc8,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
index 132f684..f8f7b27 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
@@ -361,7 +361,7 @@ uint32_t nvc0_grhub_code[] = {
        0x1fb4f000,
        0xf410b4b0,
        0xa7f0f01b,
-       0xd021f402,
+       0xd021f405,
 /* 0x0223: mmctx_stop */
        0xc82b0ef4,
        0xb4b600ab,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h
index 84af824..624215a 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h
@@ -361,7 +361,7 @@ uint32_t nvd7_grhub_code[] = {
        0x1fb4f000,
        0xf410b4b0,
        0xa7f0f01b,
-       0xd021f402,
+       0xd021f405,
 /* 0x0223: mmctx_stop */
        0xc82b0ef4,
        0xb4b600ab,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h
index 1c179bd..6547b3d 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h
@@ -361,7 +361,7 @@ uint32_t nve0_grhub_code[] = {
        0x1fb4f000,
        0xf410b4b0,
        0xa7f0f01b,
-       0xd021f402,
+       0xd021f405,
 /* 0x0223: mmctx_stop */
        0xc82b0ef4,
        0xb4b600ab,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h
index 229c0ae..a5aee5a 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h
@@ -361,7 +361,7 @@ uint32_t nvf0_grhub_code[] = {
        0x1fb4f000,
        0xf410b4b0,
        0xa7f0f01b,
-       0xd021f402,
+       0xd021f405,
 /* 0x0223: mmctx_stop */
        0xc82b0ef4,
        0xb4b600ab,