drm/nouveau/kms/nv50-: convert wndw blend_set() 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/wndw.h b/drivers/gpu/drm/nouveau/dispnv50/wndw.h
index 92985e332531458d96e0626b8f529b253082a09c..89c1d560249574080c5b009527d9bfd0b4758590 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.h
@@ -77,7 +77,7 @@ struct nv50_wndw_func {
        int (*image_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
        int (*image_clr)(struct nv50_wndw *);
        int (*scale_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
-       void (*blend_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
+       int (*blend_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
 
        void (*update)(struct nv50_wndw *, u32 *interlock);
 };
@@ -123,7 +123,7 @@ int wndwc37e_sema_clr(struct nv50_wndw *);
 int wndwc37e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 int wndwc37e_ntfy_clr(struct nv50_wndw *);
 int wndwc37e_image_clr(struct nv50_wndw *);
-void wndwc37e_blend_set(struct nv50_wndw *, struct nv50_wndw_atom *);
+int wndwc37e_blend_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 void wndwc37e_update(struct nv50_wndw *, u32 *);
 
 int wndwc57e_new(struct nouveau_drm *, enum drm_plane_type, int, s32,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
index 8b9afc6c692419e2f861f2d7679a7e6b2db559e5..8c9b0a0c289a1644f5c368d8d41637eb289894ea 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
@@ -92,24 +92,26 @@ wndwc37e_ilut(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, int size)
        return true;
 }
 
-void
+int
 wndwc37e_blend_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 8))) {
-               evo_mthd(push, 0x02ec, 7);
-               evo_data(push, asyw->blend.depth << 4);
-               evo_data(push, asyw->blend.k1);
-               evo_data(push, asyw->blend.dst_color << 12 |
-                              asyw->blend.dst_color << 8 |
-                              asyw->blend.src_color << 4 |
-                              asyw->blend.src_color);
-               evo_data(push, 0xffff0000);
-               evo_data(push, 0xffff0000);
-               evo_data(push, 0xffff0000);
-               evo_data(push, 0xffff0000);
-               evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 8)))
+               return ret;
+
+       PUSH_NVSQ(push, NVC37E, 0x02ec, asyw->blend.depth << 4,
+                               0x02f0, asyw->blend.k1,
+                               0x02f4, asyw->blend.dst_color << 12 |
+                                       asyw->blend.dst_color << 8 |
+                                       asyw->blend.src_color << 4 |
+                                       asyw->blend.src_color,
+                               0x02f8, 0xffff0000,
+                               0x02fc, 0xffff0000,
+                               0x0300, 0xffff0000,
+                               0x0304, 0xffff0000);
+       return 0;
 }
 
 int