drm/nouveau/kms/nv50-: convert core wndw_owner() 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/core.h b/drivers/gpu/drm/nouveau/dispnv50/core.h
index 113368d62f0241d0d9c235110f0dd88eb9cee2fb..7e061b8c9719c3a494d56c6a9bf54b337f0c17c1 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/core.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/core.h
@@ -23,7 +23,7 @@ struct nv50_core_func {
        int (*update)(struct nv50_core *, u32 *interlock, bool ntfy);
 
        struct {
-               void (*owner)(struct nv50_core *);
+               int (*owner)(struct nv50_core *);
        } wndw;
 
        const struct nv50_head_func *head;
@@ -64,7 +64,7 @@ int corec37d_new(struct nouveau_drm *, s32, struct nv50_core **);
 int corec37d_caps_init(struct nouveau_drm *, struct nv50_disp *);
 int corec37d_ntfy_wait_done(struct nouveau_bo *, u32, struct nvif_device *);
 int corec37d_update(struct nv50_core *, u32 *, bool);
-void corec37d_wndw_owner(struct nv50_core *);
+int corec37d_wndw_owner(struct nv50_core *);
 extern const struct nv50_outp_func sorc37d;
 
 int corec57d_new(struct nouveau_drm *, s32, struct nv50_core **);

diff --git a/drivers/gpu/drm/nouveau/dispnv50/corec37d.c b/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
index 38604f5a5d8b4494ba4aec4e13d57f743eff12e5..1b3d5896640e2fa082763b14207154687537d3b2 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
@@ -28,18 +28,20 @@
 
 #include <nouveau_bo.h>
 
-void
+int
 corec37d_wndw_owner(struct nv50_core *core)
 {
+       struct nvif_push *push = core->chan.push;
        const u32 windows = 8; /*XXX*/
-       u32 *push, i;
-       if ((push = evo_wait(&core->chan, 2 * windows))) {
-               for (i = 0; i < windows; i++) {
-                       evo_mthd(push, 0x1000 + (i * 0x080), 1);
-                       evo_data(push, i >> 1);
-               }
-               evo_kick(push, &core->chan);
-       }
+       int ret, i;
+
+       if ((ret = PUSH_WAIT(push, windows * 2)))
+               return ret;
+
+       for (i = 0; i < windows; i++)
+               PUSH_NVSQ(push, NVC37D, 0x1000 + (i * 0x080), i >> 1);
+
+       return 0;
 }
 
 int