drm/nouveau/kms/nv50-: convert core head_core_set() to new push macros
[linux-2.6-microblaze.git] / drivers / gpu / drm / nouveau / dispnv50 / head907d.c
index 3002ec2..0957e25 100644 (file)
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
+#include <drm/drm_connector.h>
+#include <drm/drm_mode_config.h>
+#include <drm/drm_vblank.h>
+#include "nouveau_drv.h"
+#include "nouveau_bios.h"
+#include "nouveau_connector.h"
 #include "head.h"
 #include "core.h"
+#include "crc.h"
+
+#include <nvif/push507c.h>
 
 void
 head907d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
@@ -29,9 +38,10 @@ head907d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
        u32 *push;
        if ((push = evo_wait(core, 3))) {
                evo_mthd(push, 0x0404 + (head->base.index * 0x300), 2);
-               evo_data(push, 0x00000001 | asyh->or.depth  << 6 |
-                                           asyh->or.nvsync << 4 |
-                                           asyh->or.nhsync << 3);
+               evo_data(push, asyh->or.depth  << 6 |
+                              asyh->or.nvsync << 4 |
+                              asyh->or.nhsync << 3 |
+                              asyh->or.crc_raster);
                evo_data(push, 0x31ec6000 | head->base.index << 25 |
                                            asyh->mode.interlace);
                evo_kick(push, core);
@@ -162,55 +172,57 @@ head907d_core_clr(struct nv50_head *head)
        }
 }
 
-void
+int
 head907d_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, 0x0460 + head->base.index * 0x300, 1);
-               evo_data(push, asyh->core.offset >> 8);
-               evo_mthd(push, 0x0468 + head->base.index * 0x300, 4);
-               evo_data(push, asyh->core.h << 16 | asyh->core.w);
-               evo_data(push, asyh->core.layout << 24 |
-                              (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, 0x04b0 + head->base.index * 0x300, 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, NV907D, 0x0460 + (i * 0x300), asyh->core.offset >> 8);
+       PUSH_NVSQ(push, NV907D, 0x0468 + (i * 0x300), asyh->core.h << 16 | asyh->core.w,
+                               0x046c + (i * 0x300), asyh->core.layout << 24 |
+                                                    (asyh->core.pitch >> 8) << 8 |
+                                                     asyh->core.blocks << 8 |
+                                                     asyh->core.blockh,
+                               0x0470 + (i * 0x300), asyh->core.format << 8,
+                               0x0474 + (i * 0x300), asyh->core.handle);
+       PUSH_NVSQ(push, NV907D, 0x04b0 + (i * 0x300), asyh->core.y << 16 | asyh->core.x);
+       return 0;
 }
 
-void
+int
 head907d_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, 0x0448 + (head->base.index * 0x300), 1);
-               evo_data(push, 0x00000000);
-               evo_mthd(push, 0x045c + (head->base.index * 0x300), 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, NV907D, 0x0448 + (i * 0x300), 0x00000000);
+       PUSH_NVSQ(push, NV907D, 0x045c + (i * 0x300), 0x00000000);
+       return 0;
 }
 
-void
+int
 head907d_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, 0x0448 + (head->base.index * 0x300), 2);
-               evo_data(push, 0x80000000 | asyh->olut.mode << 24);
-               evo_data(push, asyh->olut.offset >> 8);
-               evo_mthd(push, 0x045c + (head->base.index * 0x300), 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_NVSQ(push, NV907D, 0x0448 + (i * 0x300), 0x80000000 | asyh->olut.mode << 24,
+                               0x044c + (i * 0x300), asyh->olut.offset >> 8);
+       PUSH_NVSQ(push, NV907D, 0x045c + (i * 0x300), asyh->olut.handle);
+       return 0;
 }
 
 void
@@ -241,47 +253,47 @@ head907d_olut(struct nv50_head *head, struct nv50_head_atom *asyh, int size)
        return true;
 }
 
-void
+int
 head907d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
+       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
        struct nv50_head_mode *m = &asyh->mode;
-       u32 *push;
-       if ((push = evo_wait(core, 14))) {
-               evo_mthd(push, 0x0410 + (head->base.index * 0x300), 6);
-               evo_data(push, 0x00000000);
-               evo_data(push, m->v.active  << 16 | m->h.active );
-               evo_data(push, m->v.synce   << 16 | m->h.synce  );
-               evo_data(push, m->v.blanke  << 16 | m->h.blanke );
-               evo_data(push, m->v.blanks  << 16 | m->h.blanks );
-               evo_data(push, m->v.blank2e << 16 | m->v.blank2s);
-               evo_mthd(push, 0x042c + (head->base.index * 0x300), 2);
-               evo_data(push, 0x00000000); /* ??? */
-               evo_data(push, 0xffffff00);
-               evo_mthd(push, 0x0450 + (head->base.index * 0x300), 3);
-               evo_data(push, m->clock * 1000);
-               evo_data(push, 0x00200000); /* ??? */
-               evo_data(push, m->clock * 1000);
-               evo_kick(push, core);
-       }
+       const int i = head->base.index;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 14)))
+               return ret;
+
+       PUSH_NVSQ(push, NV907D, 0x0410 + (i * 0x300), 0x00000000,
+                               0x0414 + (i * 0x300), m->v.active  << 16 | m->h.active,
+                               0x0418 + (i * 0x300), m->v.synce   << 16 | m->h.synce,
+                               0x041c + (i * 0x300), m->v.blanke  << 16 | m->h.blanke,
+                               0x0420 + (i * 0x300), m->v.blanks  << 16 | m->h.blanks,
+                               0x0424 + (i * 0x300), m->v.blank2e << 16 | m->v.blank2s);
+       PUSH_NVSQ(push, NV907D, 0x042c + (i * 0x300), 0x00000000,
+                               0x0430 + (i * 0x300), 0xffffff00);
+       PUSH_NVSQ(push, NV907D, 0x0450 + (i * 0x300), m->clock * 1000,
+                               0x0454 + (i * 0x300), 0x00200000,
+                               0x0458 + (i * 0x300), m->clock * 1000);
+       return 0;
 }
 
-void
+int
 head907d_view(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, 8))) {
-               evo_mthd(push, 0x0494 + (head->base.index * 0x300), 1);
-               evo_data(push, 0x00000000);
-               evo_mthd(push, 0x04b8 + (head->base.index * 0x300), 1);
-               evo_data(push, asyh->view.iH << 16 | asyh->view.iW);
-               evo_mthd(push, 0x04c0 + (head->base.index * 0x300), 3);
-               evo_data(push, asyh->view.oH << 16 | asyh->view.oW);
-               evo_data(push, asyh->view.oH << 16 | asyh->view.oW);
-               evo_data(push, asyh->view.oH << 16 | asyh->view.oW);
-               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, 8)))
+               return ret;
+
+       PUSH_NVSQ(push, NV907D, 0x0494 + (i * 0x300), 0x00000000);
+       PUSH_NVSQ(push, NV907D, 0x04b8 + (i * 0x300), asyh->view.iH << 16 | asyh->view.iW);
+       PUSH_NVSQ(push, NV907D, 0x04c0 + (i * 0x300), asyh->view.oH << 16 | asyh->view.oW,
+                               0x04c4 + (i * 0x300), asyh->view.oH << 16 | asyh->view.oW,
+                               0x04c8 + (i * 0x300), asyh->view.oH << 16 | asyh->view.oW);
+       return 0;
 }
 
 const struct nv50_head_func