drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw csc_clr()

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

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
index 1d64741..1da5ffb 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
@@ -27,97 +27,98 @@
 #include <nouveau_bo.h>
 
 #include <nvif/clc37e.h>
+#include <nvif/pushc37b.h>
 
-static void
+#include <nvhw/class/clc57e.h>
+
+static int
 wndwc57e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       u32 *push;
-
-       if (!(push = evo_wait(&wndw->wndw, 17)))
-               return;
-
-       evo_mthd(push, 0x0308, 1);
-       evo_data(push, asyw->image.mode << 4 | asyw->image.interval);
-       evo_mthd(push, 0x0224, 4);
-       evo_data(push, asyw->image.h << 16 | asyw->image.w);
-       evo_data(push, asyw->image.layout << 4 | asyw->image.blockh);
-       evo_data(push, asyw->image.colorspace << 8 |
-                      asyw->image.format);
-       evo_data(push, asyw->image.blocks[0] | (asyw->image.pitch[0] >> 6));
-       evo_mthd(push, 0x0240, 1);
-       evo_data(push, asyw->image.handle[0]);
-       evo_mthd(push, 0x0260, 1);
-       evo_data(push, asyw->image.offset[0] >> 8);
-       evo_mthd(push, 0x0290, 1);
-       evo_data(push, (asyw->state.src_y >> 16) << 16 |
-                      (asyw->state.src_x >> 16));
-       evo_mthd(push, 0x0298, 1);
-       evo_data(push, (asyw->state.src_h >> 16) << 16 |
-                      (asyw->state.src_w >> 16));
-       evo_mthd(push, 0x02a4, 1);
-       evo_data(push, asyw->state.crtc_h << 16 |
-                      asyw->state.crtc_w);
-       evo_kick(push, &wndw->wndw);
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 17)))
+               return ret;
+
+       PUSH_NVSQ(push, NVC57E, 0x0308, asyw->image.mode << 4 |
+                                       asyw->image.interval);
+       PUSH_NVSQ(push, NVC57E, 0x0224, asyw->image.h << 16 | asyw->image.w,
+                               0x0228, asyw->image.layout << 4 |
+                                       asyw->image.blockh,
+                               0x022c, asyw->image.colorspace << 8 |
+                                       asyw->image.format,
+                               0x0230, asyw->image.blocks[0] |
+                                      (asyw->image.pitch[0] >> 6));
+       PUSH_NVSQ(push, NVC57E, 0x0240, asyw->image.handle[0]);
+       PUSH_NVSQ(push, NVC57E, 0x0260, asyw->image.offset[0] >> 8);
+       PUSH_NVSQ(push, NVC57E, 0x0290,(asyw->state.src_y >> 16) << 16 |
+                                      (asyw->state.src_x >> 16));
+       PUSH_NVSQ(push, NVC57E, 0x0298,(asyw->state.src_h >> 16) << 16 |
+                                      (asyw->state.src_w >> 16));
+       PUSH_NVSQ(push, NVC57E, 0x02a4, asyw->state.crtc_h << 16 |
+                                       asyw->state.crtc_w);
+       return 0;
 }
 
-static void
+static int
 wndwc57e_csc_clr(struct nv50_wndw *wndw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 13))) {
-                evo_mthd(push, 0x0400, 12);
-                evo_data(push, 0x00010000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00010000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00000000);
-                evo_data(push, 0x00010000);
-                evo_data(push, 0x00000000);
-                evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       const u32 identity[12] = {
+               0x00010000, 0x00000000, 0x00000000, 0x00000000,
+               0x00000000, 0x00010000, 0x00000000, 0x00000000,
+               0x00000000, 0x00000000, 0x00010000, 0x00000000,
+       };
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 1 + ARRAY_SIZE(identity))))
+               return ret;
+
+       PUSH_MTHD(push, NVC57E, SET_FMT_COEFFICIENT_C00, identity, ARRAY_SIZE(identity));
+       return 0;
 }
 
-static void
+static int
 wndwc57e_csc_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       u32 *push, i;
-       if ((push = evo_wait(&wndw->wndw, 13))) {
-                evo_mthd(push, 0x0400, 12);
-                for (i = 0; i < 12; i++)
-                         evo_data(push, asyw->csc.matrix[i]);
-                evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 13)))
+               return ret;
+
+       PUSH_MTHD(push, NVC57E, SET_FMT_COEFFICIENT_C00, asyw->csc.matrix, 12);
+       return 0;
 }
 
-static void
+static int
 wndwc57e_ilut_clr(struct nv50_wndw *wndw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 2))) {
-               evo_mthd(push, 0x0444, 1);
-               evo_data(push, 0x00000000);
-               evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 2)))
+               return ret;
+
+       PUSH_NVSQ(push, NVC57E, 0x0444, 0x00000000);
+       return 0;
 }
 
-static void
+static int
 wndwc57e_ilut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 4))) {
-               evo_mthd(push, 0x0440, 3);
-               evo_data(push, asyw->xlut.i.size << 8 |
-                              asyw->xlut.i.mode << 2 |
-                              asyw->xlut.i.output_mode);
-               evo_data(push, asyw->xlut.handle);
-               evo_data(push, asyw->xlut.i.offset >> 8);
-               evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 4)))
+               return ret;
+
+       PUSH_NVSQ(push, NVC57E, 0x0440, asyw->xlut.i.size << 8 |
+                                       asyw->xlut.i.mode << 2 |
+                                       asyw->xlut.i.output_mode,
+                               0x0444, asyw->xlut.handle,
+                               0x0448, asyw->xlut.i.offset >> 8);
+       return 0;
 }
 
 static u16