drm/nouveau/kms/nv50-: convert wndw csc_clr() 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/dispnv50/base907c.c b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
index 182da01..78efecc 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base907c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
@@ -127,15 +127,17 @@ base907c_csc(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
        }
 }
 
-static void
+static int
 base907c_csc_clr(struct nv50_wndw *wndw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 2))) {
-               evo_mthd(push, 0x0140, 1);
-               evo_data(push, 0x00000000);
-               evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV907C, 0x0140, 0x00000000);
+       return 0;
 }
 
 static int

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.h b/drivers/gpu/drm/nouveau/dispnv50/wndw.h
index aacabd9..5787157 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.h
@@ -68,7 +68,7 @@ struct nv50_wndw_func {
        void (*csc)(struct nv50_wndw *, struct nv50_wndw_atom *,
                    const struct drm_color_ctm *);
        int (*csc_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
-       void (*csc_clr)(struct nv50_wndw *);
+       int (*csc_clr)(struct nv50_wndw *);
        bool ilut_identity;
        int  ilut_size;
        bool olut_core;

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
index aebaf40..8ed9798 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
@@ -29,9 +29,10 @@
 #include <nvif/clc37e.h>
 #include <nvif/pushc37b.h>
 
-static void
+static int
 wndwc37e_csc_clr(struct nv50_wndw *wndw)
 {
+       return 0;
 }
 
 static int

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
index 9d155a7..1c33e18 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
@@ -61,26 +61,22 @@ wndwc57e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
        evo_kick(push, &wndw->wndw);
 }
 
-static void
+static int
 wndwc57e_csc_clr(struct nv50_wndw *wndw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 13))) {
-                evo_mthd(push, 0x0400, 12);
-                evo_data(push, 0x00010000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00010000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00010000);
-                evo_data(push, 0x00000000);
-                evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       const u32 identity[12] = {
+               0x00010000, 0x00000000, 0x00000000, 0x00000000,
+               0x00000000, 0x00010000, 0x00000000, 0x00000000,
+               0x00000000, 0x00000000, 0x00010000, 0x00000000,
+       };
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 1 + ARRAY_SIZE(identity))))
+               return ret;
+
+       PUSH_NVSQ(push, NVC57E, 0x0400, identity, ARRAY_SIZE(identity));
+       return 0;
 }
 
 static int