drm/nouveau/kms/nv50-: convert wndw scale_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/ovly.h b/drivers/gpu/drm/nouveau/dispnv50/ovly.h
index 89e84c66a0810861ff0781be5e82aaa5a52a90a6..71710fdaf1fae6f5440a80b6fe4aafd4ee67a5c4 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly.h
@@ -10,7 +10,7 @@ int ovly507e_acquire(struct nv50_wndw *, struct nv50_wndw_atom *,
                     struct nv50_head_atom *);
 void ovly507e_release(struct nv50_wndw *, struct nv50_wndw_atom *,
                      struct nv50_head_atom *);
-void ovly507e_scale_set(struct nv50_wndw *, struct nv50_wndw_atom *);
+int ovly507e_scale_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 void ovly507e_update(struct nv50_wndw *, u32 *);
 
 extern const u32 ovly827e_format[];

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
index 1460dc52942014c06e68512c3385c72c842f8d41..77f3c9789717970bb1d4dd469aff9595528e1c77 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
@@ -41,17 +41,19 @@ ovly507e_update(struct nv50_wndw *wndw, u32 *interlock)
        }
 }
 
-void
+int
 ovly507e_scale_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 4))) {
-               evo_mthd(push, 0x00e0, 3);
-               evo_data(push, asyw->scale.sy << 16 | asyw->scale.sx);
-               evo_data(push, asyw->scale.sh << 16 | asyw->scale.sw);
-               evo_data(push, asyw->scale.dw);
-               evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 4)))
+               return ret;
+
+       PUSH_NVSQ(push, NV507E, 0x00e0, asyw->scale.sy << 16 | asyw->scale.sx,
+                               0x00e4, asyw->scale.sh << 16 | asyw->scale.sw,
+                               0x00e8, asyw->scale.dw);
+       return 0;
 }
 
 static int

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.h b/drivers/gpu/drm/nouveau/dispnv50/wndw.h
index 41b4181776465c2f4ac7984886c5045a72e2f556..92985e332531458d96e0626b8f529b253082a09c 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.h
@@ -76,7 +76,7 @@ struct nv50_wndw_func {
        int (*xlut_clr)(struct nv50_wndw *);
        int (*image_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
        int (*image_clr)(struct nv50_wndw *);
-       void (*scale_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
+       int (*scale_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
        void (*blend_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
 
        void (*update)(struct nv50_wndw *, u32 *interlock);