drm/nouveau/fifo: trigger engine context unload before zeroing context pointer

Fixes a PCE0 page fault noticed on NVD9 during module unload.

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

4 files changed, 25 insertions, 25 deletions

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
index 3d3ed547ed4c..bd096364f680 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
@@ -112,14 +112,6 @@ nv50_fifo_context_detach(struct nouveau_object *parent, bool suspend,
                 return -EINVAL;
         }
 
-        nv_wo32(base->eng, addr + 0x00, 0x00000000);
-        nv_wo32(base->eng, addr + 0x04, 0x00000000);
-        nv_wo32(base->eng, addr + 0x08, 0x00000000);
-        nv_wo32(base->eng, addr + 0x0c, 0x00000000);
-        nv_wo32(base->eng, addr + 0x10, 0x00000000);
-        nv_wo32(base->eng, addr + 0x14, 0x00000000);
-        bar->flush(bar);
-
         /* HW bug workaround:
          *
          * PFIFO will hang forever if the connected engines don't report
@@ -141,8 +133,18 @@ nv50_fifo_context_detach(struct nouveau_object *parent, bool suspend,
                 if (suspend)
                         ret = -EBUSY;
         }
-
         nv_wr32(priv, 0x00b860, me);
+
+        if (ret == 0) {
+                nv_wo32(base->eng, addr + 0x00, 0x00000000);
+                nv_wo32(base->eng, addr + 0x04, 0x00000000);
+                nv_wo32(base->eng, addr + 0x08, 0x00000000);
+                nv_wo32(base->eng, addr + 0x0c, 0x00000000);
+                nv_wo32(base->eng, addr + 0x10, 0x00000000);
+                nv_wo32(base->eng, addr + 0x14, 0x00000000);
+                bar->flush(bar);
+        }
+
         return ret;
 }
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
index 7969df948cfa..1eb1c512f503 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
@@ -95,14 +95,6 @@ nv84_fifo_context_detach(struct nouveau_object *parent, bool suspend,
                 return -EINVAL;
         }
 
-        nv_wo32(base->eng, addr + 0x00, 0x00000000);
-        nv_wo32(base->eng, addr + 0x04, 0x00000000);
-        nv_wo32(base->eng, addr + 0x08, 0x00000000);
-        nv_wo32(base->eng, addr + 0x0c, 0x00000000);
-        nv_wo32(base->eng, addr + 0x10, 0x00000000);
-        nv_wo32(base->eng, addr + 0x14, 0x00000000);
-        bar->flush(bar);
-
         save = nv_mask(priv, 0x002520, 0x0000003f, 1 << engn);
         nv_wr32(priv, 0x0032fc, nv_gpuobj(base)->addr >> 12);
         done = nv_wait_ne(priv, 0x0032fc, 0xffffffff, 0xffffffff);
@@ -112,6 +104,14 @@ nv84_fifo_context_detach(struct nouveau_object *parent, bool suspend,
                 if (suspend)
                         return -EBUSY;
         }
+
+        nv_wo32(base->eng, addr + 0x00, 0x00000000);
+        nv_wo32(base->eng, addr + 0x04, 0x00000000);
+        nv_wo32(base->eng, addr + 0x08, 0x00000000);
+        nv_wo32(base->eng, addr + 0x0c, 0x00000000);
+        nv_wo32(base->eng, addr + 0x10, 0x00000000);
+        nv_wo32(base->eng, addr + 0x14, 0x00000000);
+        bar->flush(bar);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
index 8f25255247e5..b4365dde1859 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
@@ -147,10 +147,6 @@ nvc0_fifo_context_detach(struct nouveau_object *parent, bool suspend,
                 return -EINVAL;
         }
 
-        nv_wo32(base, addr + 0x00, 0x00000000);
-        nv_wo32(base, addr + 0x04, 0x00000000);
-        bar->flush(bar);
-
         nv_wr32(priv, 0x002634, chan->base.chid);
         if (!nv_wait(priv, 0x002634, 0xffffffff, chan->base.chid)) {
                 nv_error(priv, "channel %d kick timeout\n", chan->base.chid);
@@ -158,6 +154,9 @@ nvc0_fifo_context_detach(struct nouveau_object *parent, bool suspend,
                         return -EBUSY;
         }
 
+        nv_wo32(base, addr + 0x00, 0x00000000);
+        nv_wo32(base, addr + 0x04, 0x00000000);
+        bar->flush(bar);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index 9df59c028e45..c930da99c2c1 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -182,10 +182,6 @@ nve0_fifo_context_detach(struct nouveau_object *parent, bool suspend,
                 return -EINVAL;
         }
 
-        nv_wo32(base, addr + 0x00, 0x00000000);
-        nv_wo32(base, addr + 0x04, 0x00000000);
-        bar->flush(bar);
-
         nv_wr32(priv, 0x002634, chan->base.chid);
         if (!nv_wait(priv, 0x002634, 0xffffffff, chan->base.chid)) {
                 nv_error(priv, "channel %d kick timeout\n", chan->base.chid);
@@ -193,6 +189,9 @@ nve0_fifo_context_detach(struct nouveau_object *parent, bool suspend,
                         return -EBUSY;
         }
 
+        nv_wo32(base, addr + 0x00, 0x00000000);
+        nv_wo32(base, addr + 0x04, 0x00000000);
+        bar->flush(bar);
         return 0;
 }