drm/nouveau/kms/nv50-: use NVIDIA's headers for core head_olut_set()

[linux-2.6-microblaze.git] / drivers / gpu / drm / nouveau / dispnv50 / head827d.c

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head827d.c b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
index 1187711..01a8887 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head827d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
@@ -22,85 +22,100 @@
 #include "head.h"
 #include "core.h"
 
-static void
+#include <nvif/push507c.h>
+
+#include <nvhw/class/cl827d.h>
+
+static int
 head827d_curs_clr(struct nv50_head *head)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
-       u32 *push;
-       if ((push = evo_wait(core, 4))) {
-               evo_mthd(push, 0x0880 + head->base.index * 0x400, 1);
-               evo_data(push, 0x05000000);
-               evo_mthd(push, 0x089c + head->base.index * 0x400, 1);
-               evo_data(push, 0x00000000);
-               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, 4)))
+               return ret;
+
+       PUSH_NVSQ(push, NV827D, 0x0880 + (i * 0x400), 0x05000000);
+       PUSH_NVSQ(push, NV827D, 0x089c + (i * 0x400), 0x00000000);
+       return 0;
 }
 
-static void
+static int
 head827d_curs_set(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, 5))) {
-               evo_mthd(push, 0x0880 + head->base.index * 0x400, 2);
-               evo_data(push, 0x80000000 | asyh->curs.layout << 26 |
-                                           asyh->curs.format << 24);
-               evo_data(push, asyh->curs.offset >> 8);
-               evo_mthd(push, 0x089c + head->base.index * 0x400, 1);
-               evo_data(push, asyh->curs.handle);
-               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, 5)))
+               return ret;
+
+       PUSH_NVSQ(push, NV827D, 0x0880 + (i * 0x400), 0x80000000 |
+                                                     asyh->curs.layout << 26 |
+                                                     asyh->curs.format << 24,
+                               0x0884 + (i * 0x400), asyh->curs.offset >> 8);
+       PUSH_NVSQ(push, NV827D, 0x089c + (i * 0x400), asyh->curs.handle);
+       return 0;
 }
 
-static void
+static int
 head827d_core_set(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, 9))) {
-               evo_mthd(push, 0x0860 + head->base.index * 0x400, 1);
-               evo_data(push, asyh->core.offset >> 8);
-               evo_mthd(push, 0x0868 + head->base.index * 0x400, 4);
-               evo_data(push, asyh->core.h << 16 | asyh->core.w);
-               evo_data(push, asyh->core.layout << 20 |
-                              (asyh->core.pitch >> 8) << 8 |
-                              asyh->core.blocks << 8 |
-                              asyh->core.blockh);
-               evo_data(push, asyh->core.format << 8);
-               evo_data(push, asyh->core.handle);
-               evo_mthd(push, 0x08c0 + head->base.index * 0x400, 1);
-               evo_data(push, asyh->core.y << 16 | asyh->core.x);
-               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, 9)))
+               return ret;
+
+       PUSH_NVSQ(push, NV827D, 0x0860 + (i * 0x400), asyh->core.offset >> 8);
+       PUSH_NVSQ(push, NV827D, 0x0868 + (i * 0x400), asyh->core.h << 16 | asyh->core.w,
+                               0x086c + (i * 0x400), asyh->core.layout << 20 |
+                                                    (asyh->core.pitch >> 8) << 8 |
+                                                     asyh->core.blocks << 8 |
+                                                     asyh->core.blockh,
+                               0x0870 + (i * 0x400), asyh->core.format << 8,
+                               0x0874 + (i * 0x400), asyh->core.handle);
+       PUSH_NVSQ(push, NV827D, 0x08c0 + (i * 0x400), asyh->core.y << 16 | asyh->core.x);
+       return 0;
 }
 
-static void
+static int
 head827d_olut_clr(struct nv50_head *head)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
-       u32 *push;
-       if ((push = evo_wait(core, 4))) {
-               evo_mthd(push, 0x0840 + (head->base.index * 0x400), 1);
-               evo_data(push, 0x00000000);
-               evo_mthd(push, 0x085c + (head->base.index * 0x400), 1);
-               evo_data(push, 0x00000000);
-               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, 4)))
+               return ret;
+
+       PUSH_NVSQ(push, NV827D, 0x0840 + (i * 0x400), 0x00000000);
+       PUSH_NVSQ(push, NV827D, 0x085c + (i * 0x400), 0x00000000);
+       return 0;
 }
 
-static void
+static int
 head827d_olut_set(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, 5))) {
-               evo_mthd(push, 0x0840 + (head->base.index * 0x400), 2);
-               evo_data(push, 0x80000000 | asyh->olut.mode << 30);
-               evo_data(push, asyh->olut.offset >> 8);
-               evo_mthd(push, 0x085c + (head->base.index * 0x400), 1);
-               evo_data(push, asyh->olut.handle);
-               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, 5)))
+               return ret;
+
+       PUSH_MTHD(push, NV827D, HEAD_SET_BASE_LUT_LO(i),
+                 NVDEF(NV827D, HEAD_SET_BASE_LUT_LO, ENABLE, ENABLE) |
+                 NVVAL(NV827D, HEAD_SET_BASE_LUT_LO, MODE, asyh->olut.mode) |
+                 NVVAL(NV827D, HEAD_SET_BASE_LUT_LO, ORIGIN, 0),
+
+                               HEAD_SET_BASE_LUT_HI(i),
+                 NVVAL(NV827D, HEAD_SET_BASE_LUT_HI, ORIGIN, asyh->olut.offset >> 8));
+
+       PUSH_MTHD(push, NV827D, HEAD_SET_CONTEXT_DMA_LUT(i), asyh->olut.handle);
+       return 0;
 }
 
 const struct nv50_head_func