drm/nvc0-: remove nasty fifo swmthd hack for flip completion method

Not required anymore as flips are always done on the kernel's channel,
which means we can use a proper software object class instead.

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

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 4b124a67fc04..17422bc19529 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -554,19 +554,15 @@ nouveau_page_flip_emit(struct nouveau_channel *chan,
                 goto fail;
 
         /* Emit the pageflip */
-        ret = RING_SPACE(chan, 3);
+        ret = RING_SPACE(chan, 2);
         if (ret)
                 goto fail;
 
-        if (nv_device(drm->device)->card_type < NV_C0) {
+        if (nv_device(drm->device)->card_type < NV_C0)
                 BEGIN_NV04(chan, NvSubSw, NV_SW_PAGE_FLIP, 1);
-                OUT_RING  (chan, 0x00000000);
-                OUT_RING  (chan, 0x00000000);
-        } else {
-                BEGIN_NVC0(chan, 0, NV10_SUBCHAN_REF_CNT, 1);
-                OUT_RING  (chan, 0);
-                BEGIN_IMC0(chan, 0, NVSW_SUBCHAN_PAGE_FLIP, 0x0000);
-        }
+        else
+                BEGIN_NVC0(chan, FermiSw, NV_SW_PAGE_FLIP, 1);
+        OUT_RING  (chan, 0x00000000);
         FIRE_RING (chan);
 
         ret = nouveau_fence_new(chan, false, pfence);