drm/nouveau/kms/nv50-: use NVIDIA's headers for wimm update()

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

diff --git a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
index 5e03b94848b4592d40d06f9efa56c102fb8db6df..54fbd6fe751df4a4f6914d906256f4649c0313db 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
@@ -46,9 +46,12 @@ curs507a_space(struct nv50_wndw *wndw)
 static int
 curs507a_update(struct nv50_wndw *wndw, u32 *interlock)
 {
+       struct nvif_object *user = &wndw->wimm.base.user;
        int ret = nvif_chan_wait(&wndw->wimm, 1);
-       if (ret == 0)
-               nvif_wr32(&wndw->wimm.base.user, 0x0080, 0x00000000);
+       if (ret == 0) {
+               NVIF_WR32(user, NV507A, UPDATE,
+                         NVDEF(NV507A, UPDATE, INTERLOCK_WITH_CORE, DISABLE));
+       }
        return ret;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/cursc37a.c b/drivers/gpu/drm/nouveau/dispnv50/cursc37a.c
index 5bfb6f67c8c3f96941122cb775be21be12c7b7ba..e39d08698c638eb7dcb1568b4225b1e2d0f0cba6 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/cursc37a.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/cursc37a.c
@@ -27,9 +27,10 @@
 static int
 cursc37a_update(struct nv50_wndw *wndw, u32 *interlock)
 {
+       struct nvif_object *user = &wndw->wimm.base.user;
        int ret = nvif_chan_wait(&wndw->wimm, 1);
        if (ret == 0)
-               nvif_wr32(&wndw->wimm.base.user, 0x0200, 0x00000001);
+               NVIF_WR32(user, NVC37A, UPDATE, 0x00000001);
        return ret;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
index d013f89cc371ca3313e4e38f480a51d89c7af859..685b7087132426933adf63d9fdddf55fdc439995 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
@@ -37,9 +37,9 @@ wimmc37b_update(struct nv50_wndw *wndw, u32 *interlock)
        if ((ret = PUSH_WAIT(push, 2)))
                return ret;
 
-       PUSH_NVSQ(push, NVC37B, 0x0200, ((interlock[NV50_DISP_INTERLOCK_WNDW] &
-                                         wndw->interlock.data) ? 0x00000002 : 0x00000000) |
-                                       0x00000001);
+       PUSH_MTHD(push, NVC37B, UPDATE, 0x00000001 |
+                 NVVAL(NVC37B, UPDATE, INTERLOCK_WITH_WINDOW,
+                       !!(interlock[NV50_DISP_INTERLOCK_WNDW] & wndw->interlock.data)));
        return PUSH_KICK(push);
 }