drm/nv50: move tlb flushing to a helper function

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

1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index d9feee3b9f58..2a5ec887291c 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -453,19 +453,8 @@ nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
         }
         dev_priv->engine.instmem.flush(dev);
 
-        nv_wr32(dev, 0x100c80, 0x00040001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (1)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return -EBUSY;
-        }
-
-        nv_wr32(dev, 0x100c80, 0x00060001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return -EBUSY;
-        }
+        nv50_vm_flush(dev, 4);
+        nv50_vm_flush(dev, 6);
 
         gpuobj->im_bound = 1;
         return 0;
@@ -502,3 +491,11 @@ nv50_instmem_flush(struct drm_device *dev)
                 NV_ERROR(dev, "PRAMIN flush timeout\n");
 }
 
+void
+nv50_vm_flush(struct drm_device *dev, int engine)
+{
+        nv_wr32(dev, 0x100c80, (engine << 16) | 1);
+        if (!nv_wait(0x100c80, 0x00000001, 0x00000000))
+                NV_ERROR(dev, "vm flush timeout: engine %d\n", engine);
+}
+