drm/nouveau/kms/nv50-: convert core or_ctrl() 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 7e061b8..498622c 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/core.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/core.h
@@ -31,7 +31,7 @@ struct nv50_core_func {
        const struct nv50_crc_func *crc;
 #endif
        const struct nv50_outp_func {
-               void (*ctrl)(struct nv50_core *, int or, u32 ctrl,
+               int (*ctrl)(struct nv50_core *, int or, u32 ctrl,
                             struct nv50_head_atom *);
                /* XXX: Only used by SORs and PIORs for now */
                void (*get_caps)(struct nv50_disp *,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/dac507d.c b/drivers/gpu/drm/nouveau/dispnv50/dac507d.c
index 2a10ef7..4f424c6 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/dac507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/dac507d.c
@@ -21,21 +21,27 @@
  */
 #include "core.h"
 
-static void
+#include <nvif/push507c.h>
+
+static int
 dac507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       u32 *push, sync = 0;
-       if ((push = evo_wait(&core->chan, 3))) {
-               if (asyh) {
-                       sync |= asyh->or.nvsync << 1;
-                       sync |= asyh->or.nhsync;
-               }
-               evo_mthd(push, 0x0400 + (or * 0x080), 2);
-               evo_data(push, ctrl);
-               evo_data(push, sync);
-               evo_kick(push, &core->chan);
+       struct nvif_push *push = core->chan.push;
+       u32 sync = 0;
+       int ret;
+
+       if (asyh) {
+               sync |= asyh->or.nvsync << 1;
+               sync |= asyh->or.nhsync;
        }
+
+       if ((ret = PUSH_WAIT(push, 3)))
+               return ret;
+
+       PUSH_NVSQ(push, NV507D, 0x0400 + (or * 0x080), ctrl,
+                               0x0404 + (or * 0x080), sync);
+       return 0;
 }
 
 const struct nv50_outp_func

diff --git a/drivers/gpu/drm/nouveau/dispnv50/dac907d.c b/drivers/gpu/drm/nouveau/dispnv50/dac907d.c
index 11e87fa..f32e470 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/dac907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/dac907d.c
@@ -21,16 +21,20 @@
  */
 #include "core.h"
 
-static void
+#include <nvif/push507c.h>
+
+static int
 dac907d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       u32 *push;
-       if ((push = evo_wait(&core->chan, 2))) {
-               evo_mthd(push, 0x0180 + (or * 0x020), 1);
-               evo_data(push, ctrl);
-               evo_kick(push, &core->chan);
-       }
+       struct nvif_push *push = core->chan.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV907D, 0x0180 + (or * 0x020), ctrl);
+       return 0;
 }
 
 const struct nv50_outp_func

diff --git a/drivers/gpu/drm/nouveau/dispnv50/pior507d.c b/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
index 45d8ce7..6af30c1 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
@@ -21,21 +21,26 @@
  */
 #include "core.h"
 
-static void
+#include <nvif/push507c.h>
+
+static int
 pior507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
              struct nv50_head_atom *asyh)
 {
-       u32 *push;
-       if ((push = evo_wait(&core->chan, 2))) {
-               if (asyh) {
-                       ctrl |= asyh->or.depth  << 16;
-                       ctrl |= asyh->or.nvsync << 13;
-                       ctrl |= asyh->or.nhsync << 12;
-               }
-               evo_mthd(push, 0x0700 + (or * 0x040), 1);
-               evo_data(push, ctrl);
-               evo_kick(push, &core->chan);
+       struct nvif_push *push = core->chan.push;
+       int ret;
+
+       if (asyh) {
+               ctrl |= asyh->or.depth  << 16;
+               ctrl |= asyh->or.nvsync << 13;
+               ctrl |= asyh->or.nhsync << 12;
        }
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV507D, 0x0700 + (or * 0x040), ctrl);
+       return 0;
 }
 
 static void

diff --git a/drivers/gpu/drm/nouveau/dispnv50/sor507d.c b/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
index 9a59fa7..ead6616 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
@@ -21,21 +21,26 @@
  */
 #include "core.h"
 
-static void
+#include <nvif/push507c.h>
+
+static int
 sor507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       u32 *push;
-       if ((push = evo_wait(&core->chan, 2))) {
-               if (asyh) {
-                       ctrl |= asyh->or.depth  << 16;
-                       ctrl |= asyh->or.nvsync << 13;
-                       ctrl |= asyh->or.nhsync << 12;
-               }
-               evo_mthd(push, 0x0600 + (or * 0x40), 1);
-               evo_data(push, ctrl);
-               evo_kick(push, &core->chan);
+       struct nvif_push *push = core->chan.push;
+       int ret;
+
+       if (asyh) {
+               ctrl |= asyh->or.depth  << 16;
+               ctrl |= asyh->or.nvsync << 13;
+               ctrl |= asyh->or.nhsync << 12;
        }
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV507D, 0x0600 + (or * 0x40), ctrl);
+       return 0;
 }
 
 static void

diff --git a/drivers/gpu/drm/nouveau/dispnv50/sor907d.c b/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
index 9577ccf..ea5da30 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
@@ -21,19 +21,23 @@
  */
 #include "core.h"
 
-#include <nouveau_bo.h>
 #include <nvif/class.h>
+#include <nvif/push507c.h>
 
-static void
+#include <nouveau_bo.h>
+
+static int
 sor907d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       u32 *push;
-       if ((push = evo_wait(&core->chan, 2))) {
-               evo_mthd(push, 0x0200 + (or * 0x20), 1);
-               evo_data(push, ctrl);
-               evo_kick(push, &core->chan);
-       }
+       struct nvif_push *push = core->chan.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV907D, 0x0200 + (or * 0x20), ctrl);
+       return 0;
 }
 
 static void

diff --git a/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c b/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
index c86ca95..7349448 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
@@ -21,16 +21,20 @@
  */
 #include "core.h"
 
-static void
+#include <nvif/push507c.h>
+
+static int
 sorc37d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       u32 *push;
-       if ((push = evo_wait(&core->chan, 2))) {
-               evo_mthd(push, 0x0300 + (or * 0x20), 1);
-               evo_data(push, ctrl);
-               evo_kick(push, &core->chan);
-       }
+       struct nvif_push *push = core->chan.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NVC37D, 0x0300 + (or * 0x20), ctrl);
+       return 0;
 }
 
 static void