drm/nouveau/kms/nv50-: convert core crc_set_ctx() 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/crc.h b/drivers/gpu/drm/nouveau/dispnv50/crc.h
index 0c10f84b1d62ae8e14e79425d0ce0de65b273c9f..ffb7b7c19570f1801ba041f911b0b480452ac0c9 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/crc.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/crc.h
@@ -52,7 +52,7 @@ struct nv50_crc_atom {
 struct nv50_crc_func {
        int (*set_src)(struct nv50_head *, int or, enum nv50_crc_source_type,
                       struct nv50_crc_notifier_ctx *, u32 wndw);
-       void (*set_ctx)(struct nv50_head *, struct nv50_crc_notifier_ctx *);
+       int (*set_ctx)(struct nv50_head *, struct nv50_crc_notifier_ctx *);
        u32 (*get_entry)(struct nv50_head *, struct nv50_crc_notifier_ctx *,
                         enum nv50_crc_source, int idx);
        bool (*ctx_finished)(struct nv50_head *,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc907d.c b/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
index 1401cf245a4e00a8cc470fb21776a6ac68108e4a..75728dc99b64f1d9f8a04903b1ec7f0c381ac92f 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
@@ -66,18 +66,18 @@ crc907d_set_src(struct nv50_head *head, int or,
        return 0;
 }
 
-static void crc907d_set_ctx(struct nv50_head *head,
-                           struct nv50_crc_notifier_ctx *ctx)
+static int
+crc907d_set_ctx(struct nv50_head *head, struct nv50_crc_notifier_ctx *ctx)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
-       u32 *push = evo_wait(core, 2);
+       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       const int i = head->base.index;
+       int ret;
 
-       if (!push)
-               return;
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
 
-       evo_mthd(push, 0x0438 + (head->base.index * 0x300), 1);
-       evo_data(push, ctx ? ctx->ntfy.handle : 0);
-       evo_kick(push, core);
+       PUSH_NVSQ(push, NV907D, 0x0438 + (i * 0x300), ctx ? ctx->ntfy.handle : 0);
+       return 0;
 }
 
 static u32 crc907d_get_entry(struct nv50_head *head,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c b/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
index ab78f7ca85a390fb82e77ab2b109405abb670820..dd818931db09acbb6b67d72526f3f5c33841311a 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
@@ -71,18 +71,18 @@ crcc37d_set_src(struct nv50_head *head, int or,
        return 0;
 }
 
-static void crcc37d_set_ctx(struct nv50_head *head,
-                           struct nv50_crc_notifier_ctx *ctx)
+static int
+crcc37d_set_ctx(struct nv50_head *head, struct nv50_crc_notifier_ctx *ctx)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
-       u32 *push = evo_wait(core, 2);
+       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       const int i = head->base.index;
+       int ret;
 
-       if (!push)
-               return;
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
 
-       evo_mthd(push, 0x2180 + (head->base.index * 0x400), 1);
-       evo_data(push, ctx ? ctx->ntfy.handle : 0);
-       evo_kick(push, core);
+       PUSH_NVSQ(push, NVC37D, 0x2180 + (i * 0x400), ctx ? ctx->ntfy.handle : 0);
+       return 0;
 }
 
 static u32 crcc37d_get_entry(struct nv50_head *head,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/nouveau/dispnv50/disp.h
index 746ab75d15c35ec5ccfdf2a543ce7624daeb8575..fbf573a01f58149adce5ed361014e1f571f4f68b 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h
@@ -108,18 +108,4 @@ void evo_kick(u32 *, struct nv50_dmac *);
 extern const u64 disp50xx_modifiers[];
 extern const u64 disp90xx_modifiers[];
 extern const u64 wndwc57e_modifiers[];
-
-#define evo_mthd(p, m, s) do {                                         \
-       const u32 _m = (m), _s = (s);                                   \
-       if (drm_debug_enabled(DRM_UT_KMS))                              \
-               pr_err("%04x %d %s\n", _m, _s, __func__);               \
-       *((p)++) = ((_s << 18) | _m);                                   \
-} while(0)
-
-#define evo_data(p, d) do {                                            \
-       const u32 _d = (d);                                             \
-       if (drm_debug_enabled(DRM_UT_KMS))                              \
-               pr_err("\t%08x\n", _d);                                 \
-       *((p)++) = _d;                                                  \
-} while(0)
 #endif