drm/nouveau: convert nvsw init to new push macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 3879919..22d246a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -41,6 +41,7 @@
 
 #include <nvif/driver.h>
 #include <nvif/fifo.h>
+#include <nvif/push006c.h>
 #include <nvif/user.h>
 
 #include <nvif/class.h>
@@ -367,11 +368,10 @@ nouveau_accel_gr_init(struct nouveau_drm *drm)
                                       NVDRM_NVSW, nouveau_abi16_swclass(drm),
                                       NULL, 0, &drm->channel->nvsw);
                if (ret == 0) {
-                       ret = RING_SPACE(drm->channel, 2);
-                       if (ret == 0) {
-                               BEGIN_NV04(drm->channel, NvSubSw, 0, 1);
-                               OUT_RING  (drm->channel, drm->channel->nvsw.handle);
-                       }
+                       struct nvif_push *push = drm->channel->chan.push;
+                       ret = PUSH_WAIT(push, 2);
+                       if (ret == 0)
+                               PUSH_NVSQ(push, NV_SW, 0x0000, drm->channel->nvsw.handle);
                }
 
                if (ret) {