These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / engine / gr / nv25.c
index bc36251..6c4a008 100644 (file)
 #include "nv20.h"
 #include "regs.h"
 
+#include <core/gpuobj.h>
 #include <engine/fifo.h>
+#include <engine/fifo/chan.h>
 
 /*******************************************************************************
- * Graphics object classes
+ * PGRAPH context
  ******************************************************************************/
 
-struct nvkm_oclass
-nv25_gr_sclass[] = {
-       { 0x0012, &nv04_gr_ofuncs, NULL }, /* beta1 */
-       { 0x0019, &nv04_gr_ofuncs, NULL }, /* clip */
-       { 0x0030, &nv04_gr_ofuncs, NULL }, /* null */
-       { 0x0039, &nv04_gr_ofuncs, NULL }, /* m2mf */
-       { 0x0043, &nv04_gr_ofuncs, NULL }, /* rop */
-       { 0x0044, &nv04_gr_ofuncs, NULL }, /* patt */
-       { 0x004a, &nv04_gr_ofuncs, NULL }, /* gdi */
-       { 0x0062, &nv04_gr_ofuncs, NULL }, /* surf2d */
-       { 0x0072, &nv04_gr_ofuncs, NULL }, /* beta4 */
-       { 0x0089, &nv04_gr_ofuncs, NULL }, /* sifm */
-       { 0x008a, &nv04_gr_ofuncs, NULL }, /* ifc */
-       { 0x0096, &nv04_gr_ofuncs, NULL }, /* celcius */
-       { 0x009e, &nv04_gr_ofuncs, NULL }, /* swzsurf */
-       { 0x009f, &nv04_gr_ofuncs, NULL }, /* imageblit */
-       { 0x0597, &nv04_gr_ofuncs, NULL }, /* kelvin */
-       {},
+static const struct nvkm_object_func
+nv25_gr_chan = {
+       .dtor = nv20_gr_chan_dtor,
+       .init = nv20_gr_chan_init,
+       .fini = nv20_gr_chan_fini,
 };
 
-/*******************************************************************************
- * PGRAPH context
- ******************************************************************************/
-
 static int
-nv25_gr_context_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-                    struct nvkm_oclass *oclass, void *data, u32 size,
-                    struct nvkm_object **pobject)
+nv25_gr_chan_new(struct nvkm_gr *base, struct nvkm_fifo_chan *fifoch,
+                const struct nvkm_oclass *oclass, struct nvkm_object **pobject)
 {
+       struct nv20_gr *gr = nv20_gr(base);
        struct nv20_gr_chan *chan;
        int ret, i;
 
-       ret = nvkm_gr_context_create(parent, engine, oclass, NULL, 0x3724,
-                                    16, NVOBJ_FLAG_ZERO_ALLOC, &chan);
-       *pobject = nv_object(chan);
+       if (!(chan = kzalloc(sizeof(*chan), GFP_KERNEL)))
+               return -ENOMEM;
+       nvkm_object_ctor(&nv25_gr_chan, oclass, &chan->object);
+       chan->gr = gr;
+       chan->chid = fifoch->chid;
+       *pobject = &chan->object;
+
+       ret = nvkm_memory_new(gr->base.engine.subdev.device,
+                             NVKM_MEM_TARGET_INST, 0x3724, 16, true,
+                             &chan->inst);
        if (ret)
                return ret;
 
-       chan->chid = nvkm_fifo_chan(parent)->chid;
-
-       nv_wo32(chan, 0x0028, 0x00000001 | (chan->chid << 24));
-       nv_wo32(chan, 0x035c, 0xffff0000);
-       nv_wo32(chan, 0x03c0, 0x0fff0000);
-       nv_wo32(chan, 0x03c4, 0x0fff0000);
-       nv_wo32(chan, 0x049c, 0x00000101);
-       nv_wo32(chan, 0x04b0, 0x00000111);
-       nv_wo32(chan, 0x04c8, 0x00000080);
-       nv_wo32(chan, 0x04cc, 0xffff0000);
-       nv_wo32(chan, 0x04d0, 0x00000001);
-       nv_wo32(chan, 0x04e4, 0x44400000);
-       nv_wo32(chan, 0x04fc, 0x4b800000);
+       nvkm_kmap(chan->inst);
+       nvkm_wo32(chan->inst, 0x0028, 0x00000001 | (chan->chid << 24));
+       nvkm_wo32(chan->inst, 0x035c, 0xffff0000);
+       nvkm_wo32(chan->inst, 0x03c0, 0x0fff0000);
+       nvkm_wo32(chan->inst, 0x03c4, 0x0fff0000);
+       nvkm_wo32(chan->inst, 0x049c, 0x00000101);
+       nvkm_wo32(chan->inst, 0x04b0, 0x00000111);
+       nvkm_wo32(chan->inst, 0x04c8, 0x00000080);
+       nvkm_wo32(chan->inst, 0x04cc, 0xffff0000);
+       nvkm_wo32(chan->inst, 0x04d0, 0x00000001);
+       nvkm_wo32(chan->inst, 0x04e4, 0x44400000);
+       nvkm_wo32(chan->inst, 0x04fc, 0x4b800000);
        for (i = 0x0510; i <= 0x051c; i += 4)
-               nv_wo32(chan, i, 0x00030303);
+               nvkm_wo32(chan->inst, i, 0x00030303);
        for (i = 0x0530; i <= 0x053c; i += 4)
-               nv_wo32(chan, i, 0x00080000);
+               nvkm_wo32(chan->inst, i, 0x00080000);
        for (i = 0x0548; i <= 0x0554; i += 4)
-               nv_wo32(chan, i, 0x01012000);
+               nvkm_wo32(chan->inst, i, 0x01012000);
        for (i = 0x0558; i <= 0x0564; i += 4)
-               nv_wo32(chan, i, 0x000105b8);
+               nvkm_wo32(chan->inst, i, 0x000105b8);
        for (i = 0x0568; i <= 0x0574; i += 4)
-               nv_wo32(chan, i, 0x00080008);
+               nvkm_wo32(chan->inst, i, 0x00080008);
        for (i = 0x0598; i <= 0x05d4; i += 4)
-               nv_wo32(chan, i, 0x07ff0000);
-       nv_wo32(chan, 0x05e0, 0x4b7fffff);
-       nv_wo32(chan, 0x0620, 0x00000080);
-       nv_wo32(chan, 0x0624, 0x30201000);
-       nv_wo32(chan, 0x0628, 0x70605040);
-       nv_wo32(chan, 0x062c, 0xb0a09080);
-       nv_wo32(chan, 0x0630, 0xf0e0d0c0);
-       nv_wo32(chan, 0x0664, 0x00000001);
-       nv_wo32(chan, 0x066c, 0x00004000);
-       nv_wo32(chan, 0x0678, 0x00000001);
-       nv_wo32(chan, 0x0680, 0x00040000);
-       nv_wo32(chan, 0x0684, 0x00010000);
+               nvkm_wo32(chan->inst, i, 0x07ff0000);
+       nvkm_wo32(chan->inst, 0x05e0, 0x4b7fffff);
+       nvkm_wo32(chan->inst, 0x0620, 0x00000080);
+       nvkm_wo32(chan->inst, 0x0624, 0x30201000);
+       nvkm_wo32(chan->inst, 0x0628, 0x70605040);
+       nvkm_wo32(chan->inst, 0x062c, 0xb0a09080);
+       nvkm_wo32(chan->inst, 0x0630, 0xf0e0d0c0);
+       nvkm_wo32(chan->inst, 0x0664, 0x00000001);
+       nvkm_wo32(chan->inst, 0x066c, 0x00004000);
+       nvkm_wo32(chan->inst, 0x0678, 0x00000001);
+       nvkm_wo32(chan->inst, 0x0680, 0x00040000);
+       nvkm_wo32(chan->inst, 0x0684, 0x00010000);
        for (i = 0x1b04; i <= 0x2374; i += 16) {
-               nv_wo32(chan, (i + 0), 0x10700ff9);
-               nv_wo32(chan, (i + 4), 0x0436086c);
-               nv_wo32(chan, (i + 8), 0x000c001b);
+               nvkm_wo32(chan->inst, (i + 0), 0x10700ff9);
+               nvkm_wo32(chan->inst, (i + 4), 0x0436086c);
+               nvkm_wo32(chan->inst, (i + 8), 0x000c001b);
        }
-       nv_wo32(chan, 0x2704, 0x3f800000);
-       nv_wo32(chan, 0x2718, 0x3f800000);
-       nv_wo32(chan, 0x2744, 0x40000000);
-       nv_wo32(chan, 0x2748, 0x3f800000);
-       nv_wo32(chan, 0x274c, 0x3f000000);
-       nv_wo32(chan, 0x2754, 0x40000000);
-       nv_wo32(chan, 0x2758, 0x3f800000);
-       nv_wo32(chan, 0x2760, 0xbf800000);
-       nv_wo32(chan, 0x2768, 0xbf800000);
-       nv_wo32(chan, 0x308c, 0x000fe000);
-       nv_wo32(chan, 0x3108, 0x000003f8);
-       nv_wo32(chan, 0x3468, 0x002fe000);
+       nvkm_wo32(chan->inst, 0x2704, 0x3f800000);
+       nvkm_wo32(chan->inst, 0x2718, 0x3f800000);
+       nvkm_wo32(chan->inst, 0x2744, 0x40000000);
+       nvkm_wo32(chan->inst, 0x2748, 0x3f800000);
+       nvkm_wo32(chan->inst, 0x274c, 0x3f000000);
+       nvkm_wo32(chan->inst, 0x2754, 0x40000000);
+       nvkm_wo32(chan->inst, 0x2758, 0x3f800000);
+       nvkm_wo32(chan->inst, 0x2760, 0xbf800000);
+       nvkm_wo32(chan->inst, 0x2768, 0xbf800000);
+       nvkm_wo32(chan->inst, 0x308c, 0x000fe000);
+       nvkm_wo32(chan->inst, 0x3108, 0x000003f8);
+       nvkm_wo32(chan->inst, 0x3468, 0x002fe000);
        for (i = 0x3484; i <= 0x34a0; i += 4)
-               nv_wo32(chan, i, 0x001c527c);
+               nvkm_wo32(chan->inst, i, 0x001c527c);
+       nvkm_done(chan->inst);
        return 0;
 }
 
-static struct nvkm_oclass
-nv25_gr_cclass = {
-       .handle = NV_ENGCTX(GR, 0x25),
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv25_gr_context_ctor,
-               .dtor = _nvkm_gr_context_dtor,
-               .init = nv20_gr_context_init,
-               .fini = nv20_gr_context_fini,
-               .rd32 = _nvkm_gr_context_rd32,
-               .wr32 = _nvkm_gr_context_wr32,
-       },
-};
-
 /*******************************************************************************
  * PGRAPH engine/subdev functions
  ******************************************************************************/
 
-static int
-nv25_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-            struct nvkm_oclass *oclass, void *data, u32 size,
-            struct nvkm_object **pobject)
-{
-       struct nv20_gr_priv *priv;
-       int ret;
-
-       ret = nvkm_gr_create(parent, engine, oclass, true, &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       ret = nvkm_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16,
-                             NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab);
-       if (ret)
-               return ret;
+static const struct nvkm_gr_func
+nv25_gr = {
+       .dtor = nv20_gr_dtor,
+       .oneinit = nv20_gr_oneinit,
+       .init = nv20_gr_init,
+       .intr = nv20_gr_intr,
+       .tile = nv20_gr_tile,
+       .chan_new = nv25_gr_chan_new,
+       .sclass = {
+               { -1, -1, 0x0012, &nv04_gr_object }, /* beta1 */
+               { -1, -1, 0x0019, &nv04_gr_object }, /* clip */
+               { -1, -1, 0x0030, &nv04_gr_object }, /* null */
+               { -1, -1, 0x0039, &nv04_gr_object }, /* m2mf */
+               { -1, -1, 0x0043, &nv04_gr_object }, /* rop */
+               { -1, -1, 0x0044, &nv04_gr_object }, /* patt */
+               { -1, -1, 0x004a, &nv04_gr_object }, /* gdi */
+               { -1, -1, 0x0062, &nv04_gr_object }, /* surf2d */
+               { -1, -1, 0x0072, &nv04_gr_object }, /* beta4 */
+               { -1, -1, 0x0089, &nv04_gr_object }, /* sifm */
+               { -1, -1, 0x008a, &nv04_gr_object }, /* ifc */
+               { -1, -1, 0x0096, &nv04_gr_object }, /* celcius */
+               { -1, -1, 0x009e, &nv04_gr_object }, /* swzsurf */
+               { -1, -1, 0x009f, &nv04_gr_object }, /* imageblit */
+               { -1, -1, 0x0597, &nv04_gr_object }, /* kelvin */
+               {}
+       }
+};
 
-       nv_subdev(priv)->unit = 0x00001000;
-       nv_subdev(priv)->intr = nv20_gr_intr;
-       nv_engine(priv)->cclass = &nv25_gr_cclass;
-       nv_engine(priv)->sclass = nv25_gr_sclass;
-       nv_engine(priv)->tile_prog = nv20_gr_tile_prog;
-       return 0;
+int
+nv25_gr_new(struct nvkm_device *device, int index, struct nvkm_gr **pgr)
+{
+       return nv20_gr_new_(&nv25_gr, device, index, pgr);
 }
-
-struct nvkm_oclass
-nv25_gr_oclass = {
-       .handle = NV_ENGINE(GR, 0x25),
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv25_gr_ctor,
-               .dtor = nv20_gr_dtor,
-               .init = nv20_gr_init,
-               .fini = _nvkm_gr_fini,
-       },
-};