drm/nouveau/falcon: convert user classes to new-style nvkm_object

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nvkm / engine / ce / gt215.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
index d8bb4293bc11d0ec8067499b9552e84eba9d787f..35e4d578b153b28d9e671f33b58ee3cd01201e7e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
@@ -22,49 +22,13 @@
  * Authors: Ben Skeggs
  */
 #include <engine/ce.h>
-#include <engine/falcon.h>
 #include <engine/fifo.h>
 #include "fuc/gt215.fuc3.h"
 
 #include <core/client.h>
-#include <core/device.h>
 #include <core/enum.h>
 
-struct gt215_ce_priv {
-       struct nvkm_falcon base;
-};
-
-/*******************************************************************************
- * Copy object classes
- ******************************************************************************/
-
-static struct nvkm_oclass
-gt215_ce_sclass[] = {
-       { 0x85b5, &nvkm_object_ofuncs },
-       {}
-};
-
-/*******************************************************************************
- * PCE context
- ******************************************************************************/
-
-static struct nvkm_oclass
-gt215_ce_cclass = {
-       .handle = NV_ENGCTX(CE0, 0xa3),
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_falcon_context_ctor,
-               .dtor = _nvkm_falcon_context_dtor,
-               .init = _nvkm_falcon_context_init,
-               .fini = _nvkm_falcon_context_fini,
-               .rd32 = _nvkm_falcon_context_rd32,
-               .wr32 = _nvkm_falcon_context_wr32,
-
-       },
-};
-
-/*******************************************************************************
- * PCE engine/subdev functions
- ******************************************************************************/
+#include <nvif/class.h>
 
 static const struct nvkm_enum
 gt215_ce_isr_error_name[] = {
@@ -75,42 +39,35 @@ gt215_ce_isr_error_name[] = {
 };
 
 void
-gt215_ce_intr(struct nvkm_subdev *subdev)
+gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_fifo_chan *chan)
 {
-       struct nvkm_fifo *pfifo = nvkm_fifo(subdev);
-       struct nvkm_engine *engine = nv_engine(subdev);
-       struct nvkm_falcon *falcon = (void *)subdev;
-       struct nvkm_object *engctx;
-       u32 dispatch = nv_ro32(falcon, 0x01c);
-       u32 stat = nv_ro32(falcon, 0x008) & dispatch & ~(dispatch >> 16);
-       u64 inst = nv_ro32(falcon, 0x050) & 0x3fffffff;
-       u32 ssta = nv_ro32(falcon, 0x040) & 0x0000ffff;
-       u32 addr = nv_ro32(falcon, 0x040) >> 16;
+       struct nvkm_subdev *subdev = &ce->engine.subdev;
+       struct nvkm_device *device = subdev->device;
+       const u32 base = (nv_subidx(subdev) - NVDEV_ENGINE_CE0) * 0x1000;
+       u32 ssta = nvkm_rd32(device, 0x104040 + base) & 0x0000ffff;
+       u32 addr = nvkm_rd32(device, 0x104040 + base) >> 16;
        u32 mthd = (addr & 0x07ff) << 2;
        u32 subc = (addr & 0x3800) >> 11;
-       u32 data = nv_ro32(falcon, 0x044);
-       int chid;
-
-       engctx = nvkm_engctx_get(engine, inst);
-       chid   = pfifo->chid(pfifo, engctx);
-
-       if (stat & 0x00000040) {
-               nv_error(falcon, "DISPATCH_ERROR [");
-               nvkm_enum_print(gt215_ce_isr_error_name, ssta);
-               pr_cont("] ch %d [0x%010llx %s] subc %d mthd 0x%04x data 0x%08x\n",
-                      chid, inst << 12, nvkm_client_name(engctx), subc,
-                      mthd, data);
-               nv_wo32(falcon, 0x004, 0x00000040);
-               stat &= ~0x00000040;
-       }
+       u32 data = nvkm_rd32(device, 0x104044 + base);
+       const struct nvkm_enum *en =
+               nvkm_enum_find(gt215_ce_isr_error_name, ssta);
+
+       nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] ch %d [%010llx %s] "
+                          "subc %d mthd %04x data %08x\n", ssta,
+                  en ? en->name : "", chan ? chan->chid : -1,
+                  chan ? chan->inst->addr : 0,
+                  chan ? chan->object.client->name : "unknown",
+                  subc, mthd, data);
+}
 
-       if (stat) {
-               nv_error(falcon, "unhandled intr 0x%08x\n", stat);
-               nv_wo32(falcon, 0x004, stat);
+static const struct nvkm_falcon_func
+gt215_ce_func = {
+       .intr = gt215_ce_intr,
+       .sclass = {
+               { -1, -1, GT212_DMA },
+               {}
        }
-
-       nvkm_engctx_put(engctx);
-}
+};
 
 static int
 gt215_ce_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
@@ -118,23 +75,20 @@ gt215_ce_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
              struct nvkm_object **pobject)
 {
        bool enable = (nv_device(parent)->chipset != 0xaf);
-       struct gt215_ce_priv *priv;
+       struct nvkm_falcon *ce;
        int ret;
 
-       ret = nvkm_falcon_create(parent, engine, oclass, 0x104000, enable,
-                                "PCE0", "ce0", &priv);
-       *pobject = nv_object(priv);
+       ret = nvkm_falcon_create(&gt215_ce_func, parent, engine, oclass,
+                                0x104000, enable, "PCE0", "ce0", &ce);
+       *pobject = nv_object(ce);
        if (ret)
                return ret;
 
-       nv_subdev(priv)->unit = 0x00802000;
-       nv_subdev(priv)->intr = gt215_ce_intr;
-       nv_engine(priv)->cclass = &gt215_ce_cclass;
-       nv_engine(priv)->sclass = gt215_ce_sclass;
-       nv_falcon(priv)->code.data = gt215_pce_code;
-       nv_falcon(priv)->code.size = sizeof(gt215_pce_code);
-       nv_falcon(priv)->data.data = gt215_pce_data;
-       nv_falcon(priv)->data.size = sizeof(gt215_pce_data);
+       nv_subdev(ce)->unit = 0x00802000;
+       nv_falcon(ce)->code.data = gt215_ce_code;
+       nv_falcon(ce)->code.size = sizeof(gt215_ce_code);
+       nv_falcon(ce)->data.data = gt215_ce_data;
+       nv_falcon(ce)->data.size = sizeof(gt215_ce_data);
        return 0;
 }
 
@@ -146,7 +100,5 @@ gt215_ce_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = _nvkm_falcon_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };