drm/nouveau/kms/nv50-: convert core head_dither() 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/head.h b/drivers/gpu/drm/nouveau/dispnv50/head.h
index b5b08b4a6cf7d0ce0d07e41978b65999045d2026..5cc65ca2c14b92e6dfc3d23e6f8a5952de3cd4e6 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/head.h
@@ -43,7 +43,7 @@ struct nv50_head_func {
        int (*curs_clr)(struct nv50_head *);
        int (*base)(struct nv50_head *, struct nv50_head_atom *);
        int (*ovly)(struct nv50_head *, struct nv50_head_atom *);
-       void (*dither)(struct nv50_head *, struct nv50_head_atom *);
+       int (*dither)(struct nv50_head *, struct nv50_head_atom *);
        void (*procamp)(struct nv50_head *, struct nv50_head_atom *);
        void (*or)(struct nv50_head *, struct nv50_head_atom *);
        void (*static_wndw_map)(struct nv50_head *, struct nv50_head_atom *);
@@ -61,7 +61,7 @@ int head507d_curs_format(struct nv50_head *, struct nv50_wndw_atom *,
                         struct nv50_head_atom *);
 int head507d_base(struct nv50_head *, struct nv50_head_atom *);
 int head507d_ovly(struct nv50_head *, struct nv50_head_atom *);
-void head507d_dither(struct nv50_head *, struct nv50_head_atom *);
+int head507d_dither(struct nv50_head *, struct nv50_head_atom *);
 void head507d_procamp(struct nv50_head *, struct nv50_head_atom *);
 
 extern const struct nv50_head_func head827d;
@@ -90,7 +90,7 @@ int headc37d_curs_format(struct nv50_head *, struct nv50_wndw_atom *,
                         struct nv50_head_atom *);
 int headc37d_curs_set(struct nv50_head *, struct nv50_head_atom *);
 int headc37d_curs_clr(struct nv50_head *);
-void headc37d_dither(struct nv50_head *, struct nv50_head_atom *);
+int headc37d_dither(struct nv50_head *, struct nv50_head_atom *);
 void headc37d_static_wndw_map(struct nv50_head *, struct nv50_head_atom *);
 
 extern const struct nv50_head_func headc57d;

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head507d.c b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
index 16598e100795b4a902d197c47d4d6131ea0653f0..34300607fc539f430de003baa07652b51e19375b 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
@@ -37,18 +37,20 @@ head507d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
        }
 }
 
-void
+int
 head507d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
-       u32 *push;
-       if ((push = evo_wait(core, 2))) {
-               evo_mthd(push, 0x08a0 + (head->base.index * 0x0400), 1);
-               evo_data(push, asyh->dither.mode << 3 |
-                              asyh->dither.bits << 1 |
-                              asyh->dither.enable);
-               evo_kick(push, core);
-       }
+       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       const int i = head->base.index;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV507D, 0x08a0 + (i * 0x400), asyh->dither.mode << 3 |
+                                                     asyh->dither.bits << 1 |
+                                                     asyh->dither.enable);
+       return 0;
 }
 
 int

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head907d.c b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
index fe5f1a9d59b3f8ddec80a6070c064a1377b2b163..b7fda2284e173bb845985bb772624ceadf9f92a2 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
@@ -61,18 +61,20 @@ head907d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
        }
 }
 
-static void
+static int
 head907d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
-       u32 *push;
-       if ((push = evo_wait(core, 2))) {
-               evo_mthd(push, 0x0490 + (head->base.index * 0x0300), 1);
-               evo_data(push, asyh->dither.mode << 3 |
-                              asyh->dither.bits << 1 |
-                              asyh->dither.enable);
-               evo_kick(push, core);
-       }
+       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       const int i = head->base.index;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV907D, 0x0490 + (i * 0x300), asyh->dither.mode << 3 |
+                                                     asyh->dither.bits << 1 |
+                                                     asyh->dither.enable);
+       return 0;
 }
 
 int

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head917d.c b/drivers/gpu/drm/nouveau/dispnv50/head917d.c
index ec7511f47c71377170968bbc8a1ca937ed81484f..07d12f3ba333c6404016b56c723c9289c5904663 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head917d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head917d.c
@@ -24,18 +24,20 @@
 
 #include <nvif/push507c.h>
 
-static void
+static int
 head917d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
-       u32 *push;
-       if ((push = evo_wait(core, 2))) {
-               evo_mthd(push, 0x04a0 + (head->base.index * 0x0300), 1);
-               evo_data(push, asyh->dither.mode << 3 |
-                              asyh->dither.bits << 1 |
-                              asyh->dither.enable);
-               evo_kick(push, core);
-       }
+       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       const int i = head->base.index;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV917D, 0x04a0 + (i * 0x300), asyh->dither.mode << 3 |
+                                                     asyh->dither.bits << 1 |
+                                                     asyh->dither.enable);
+       return 0;
 }
 
 static int

diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
index 2ecfcf45f8a8fa8ee828714704edf23b749646df..0accc19991a4010187f23648251136b17006af22 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
@@ -70,18 +70,20 @@ headc37d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
        }
 }
 
-void
+int
 headc37d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
-       u32 *push;
-       if ((push = evo_wait(core, 2))) {
-               evo_mthd(push, 0x2018 + (head->base.index * 0x0400), 1);
-               evo_data(push, asyh->dither.mode << 8 |
-                              asyh->dither.bits << 4 |
-                              asyh->dither.enable);
-               evo_kick(push, core);
-       }
+       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       const int i = head->base.index;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NV907D, 0x2018 + (i * 0x400), asyh->dither.mode << 8 |
+                                                     asyh->dither.bits << 4 |
+                                                     asyh->dither.enable);
+       return 0;
 }
 
 int