drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw sema_set()

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

drivers/gpu/drm/nouveau/dispnv50/base507c.c

@@ -26,6 +26,8 @@
 #include <nvif/push507c.h>
 #include <nvif/timer.h>
 
+#include <nvhw/class/cl507c.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
@@ -185,10 +187,10 @@ base507c_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 	if ((ret = PUSH_WAIT(push, 5)))
 		return ret;
 
-	PUSH_NVSQ(push, NV507C, 0x0088, asyw->sema.offset,
-				0x008c, asyw->sema.acquire,
-				0x0090, asyw->sema.release,
-				0x0094, asyw->sema.handle);
+	PUSH_MTHD(push, NV507C, SET_SEMAPHORE_CONTROL, asyw->sema.offset,
+				SET_SEMAPHORE_ACQUIRE, asyw->sema.acquire,
+				SET_SEMAPHORE_RELEASE, asyw->sema.release,
+				SET_CONTEXT_DMA_SEMAPHORE, asyw->sema.handle);
 	return 0;
 }
 

drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c

@@ -29,6 +29,8 @@
 #include <nvif/clc37e.h>
 #include <nvif/pushc37b.h>
 
+#include <nvhw/class/clc37e.h>
+
 static int
 wndwc37e_csc_clr(struct nv50_wndw *wndw)
 {
@@ -208,10 +210,10 @@ wndwc37e_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 	if ((ret = PUSH_WAIT(push, 5)))
 		return ret;
 
-	PUSH_NVSQ(push, NVC37E, 0x020c, asyw->sema.offset,
-				0x0210, asyw->sema.acquire,
-				0x0214, asyw->sema.release,
-				0x0218, asyw->sema.handle);
+	PUSH_MTHD(push, NVC37E, SET_SEMAPHORE_CONTROL, asyw->sema.offset,
+				SET_SEMAPHORE_ACQUIRE, asyw->sema.acquire,
+				SET_SEMAPHORE_RELEASE, asyw->sema.release,
+				SET_CONTEXT_DMA_SEMAPHORE, asyw->sema.handle);
 	return 0;
 }