drm/nouveau/falcon: remove object accessor functions

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
index 7532cd785c883859a0c814c6af35c78cc05b8a46..3ce0ffc8ef8692788857655cb17f735f47d0d971 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
@@ -76,6 +76,4 @@ void nvkm_falcon_intr(struct nvkm_subdev *subdev);
 #define _nvkm_falcon_dtor _nvkm_engine_dtor
 int  _nvkm_falcon_init(struct nvkm_object *);
 int  _nvkm_falcon_fini(struct nvkm_object *, bool);
-u32  _nvkm_falcon_rd32(struct nvkm_object *, u64);
-void _nvkm_falcon_wr32(struct nvkm_object *, u64, u32);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c
index bbe07c4d084348f7d1d49920450cca4dab145047..1989f659716c15bf232a1f57b17195140a5c3ccf 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c
@@ -75,13 +75,16 @@ static int
 gf100_ce_init(struct nvkm_object *object)
 {
        struct nvkm_falcon *ce = (void *)object;
+       struct nvkm_device *device = ce->engine.subdev.device;
+       const int idx = nv_engidx(&ce->engine) - NVDEV_ENGINE_CE0;
+       u32 base = idx * 0x1000;
        int ret;
 
        ret = nvkm_falcon_init(ce);
        if (ret)
                return ret;
 
-       nv_wo32(ce, 0x084, nv_engidx(&ce->engine) - NVDEV_ENGINE_CE0);
+       nvkm_wr32(device, 0x104084 + base, idx);
        return 0;
 }
 
@@ -143,8 +146,6 @@ gf100_ce0_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = gf100_ce_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };
 
@@ -156,7 +157,5 @@ gf100_ce1_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = gf100_ce_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
index 49aeeb74990a34e24fd2e79e35c6b76c3964aed7..b52acdcaa81e9abcd6fdf455458e2c802b7ec95d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
@@ -72,19 +72,21 @@ gt215_ce_isr_error_name[] = {
 void
 gt215_ce_intr(struct nvkm_subdev *subdev)
 {
-       struct nvkm_fifo *fifo = nvkm_fifo(subdev);
-       struct nvkm_engine *engine = nv_engine(subdev);
-       struct nvkm_falcon *falcon = (void *)subdev;
+       struct nvkm_falcon *ce = (void *)subdev;
+       struct nvkm_engine *engine = &ce->engine;
+       struct nvkm_device *device = engine->subdev.device;
+       struct nvkm_fifo *fifo = device->fifo;
        struct nvkm_object *engctx;
        const struct nvkm_enum *en;
-       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;
+       const u32 base = (nv_subidx(subdev) - NVDEV_ENGINE_CE0) * 0x1000;
+       u32 dispatch = nvkm_rd32(device, 0x10401c + base);
+       u32 stat = nvkm_rd32(device, 0x104008 + base) & dispatch & ~(dispatch >> 16);
+       u64 inst = nvkm_rd32(device, 0x104050 + base) & 0x3fffffff;
+       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);
+       u32 data = nvkm_rd32(device, 0x104044 + base);
        int chid;
 
        engctx = nvkm_engctx_get(engine, inst);
@@ -97,13 +99,13 @@ gt215_ce_intr(struct nvkm_subdev *subdev)
                                   "mthd %04x data %08x\n",
                           ssta, en ? en->name : "", chid, inst << 12,
                           nvkm_client_name(engctx), subc, mthd, data);
-               nv_wo32(falcon, 0x004, 0x00000040);
+               nvkm_wr32(device, 0x104004 + base, 0x00000040);
                stat &= ~0x00000040;
        }
 
        if (stat) {
                nvkm_error(subdev, "intr %08x\n", stat);
-               nv_wo32(falcon, 0x004, stat);
+               nvkm_wr32(device, 0x104004 + base, stat);
        }
 
        nvkm_engctx_put(engctx);
@@ -143,7 +145,5 @@ gt215_ce_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = _nvkm_falcon_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
index e0e76756a12773d7855d09c9d1d7fe1f97a40570..dcf1782675feb98b5b01e0f9d8f49531ea7f668f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
@@ -27,35 +27,23 @@ void
 nvkm_falcon_intr(struct nvkm_subdev *subdev)
 {
        struct nvkm_falcon *falcon = (void *)subdev;
-       u32 dispatch = nv_ro32(falcon, 0x01c);
-       u32 intr = nv_ro32(falcon, 0x008) & dispatch & ~(dispatch >> 16);
+       struct nvkm_device *device = falcon->engine.subdev.device;
+       const u32 base = falcon->addr;
+       u32 dispatch = nvkm_rd32(device, base + 0x01c);
+       u32 intr = nvkm_rd32(device, base + 0x008) & dispatch & ~(dispatch >> 16);
 
        if (intr & 0x00000010) {
                nvkm_debug(subdev, "ucode halted\n");
-               nv_wo32(falcon, 0x004, 0x00000010);
+               nvkm_wr32(device, base + 0x004, 0x00000010);
                intr &= ~0x00000010;
        }
 
        if (intr)  {
                nvkm_error(subdev, "intr %08x\n", intr);
-               nv_wo32(falcon, 0x004, intr);
+               nvkm_wr32(device, base + 0x004, intr);
        }
 }
 
-u32
-_nvkm_falcon_rd32(struct nvkm_object *object, u64 addr)
-{
-       struct nvkm_falcon *falcon = (void *)object;
-       return nvkm_rd32(falcon->engine.subdev.device, falcon->addr + addr);
-}
-
-void
-_nvkm_falcon_wr32(struct nvkm_object *object, u64 addr, u32 data)
-{
-       struct nvkm_falcon *falcon = (void *)object;
-       nvkm_wr32(falcon->engine.subdev.device, falcon->addr + addr, data);
-}
-
 static void *
 vmemdup(const void *src, size_t len)
 {
@@ -74,6 +62,7 @@ _nvkm_falcon_init(struct nvkm_object *object)
        struct nvkm_device *device = subdev->device;
        const struct firmware *fw;
        char name[32] = "internal";
+       const u32 base = falcon->addr;
        int ret, i;
        u32 caps;
 
@@ -87,12 +76,12 @@ _nvkm_falcon_init(struct nvkm_object *object)
                falcon->version = 0;
                falcon->secret  = (falcon->addr == 0x087000) ? 1 : 0;
        } else {
-               caps = nv_ro32(falcon, 0x12c);
+               caps = nvkm_rd32(device, base + 0x12c);
                falcon->version = (caps & 0x0000000f);
                falcon->secret  = (caps & 0x00000030) >> 4;
        }
 
-       caps = nv_ro32(falcon, 0x108);
+       caps = nvkm_rd32(device, base + 0x108);
        falcon->code.limit = (caps & 0x000001ff) << 8;
        falcon->data.limit = (caps & 0x0003fe00) >> 1;
 
@@ -105,20 +94,20 @@ _nvkm_falcon_init(struct nvkm_object *object)
        if (falcon->secret && falcon->version < 4) {
                if (!falcon->version) {
                        nvkm_msec(device, 2000,
-                               if (nv_ro32(falcon, 0x008) & 0x00000010)
+                               if (nvkm_rd32(device, base + 0x008) & 0x00000010)
                                        break;
                        );
                } else {
                        nvkm_msec(device, 2000,
-                               if (!(nv_ro32(falcon, 0x180) & 0x80000000))
+                               if (!(nvkm_rd32(device, base + 0x180) & 0x80000000))
                                        break;
                        );
                }
-               nv_wo32(falcon, 0x004, 0x00000010);
+               nvkm_wr32(device, base + 0x004, 0x00000010);
        }
 
        /* disable all interrupts */
-       nv_wo32(falcon, 0x014, 0xffffffff);
+       nvkm_wr32(device, base + 0x014, 0xffffffff);
 
        /* no default ucode provided by the engine implementation, try and
         * locate a "self-bootstrapping" firmware image for the engine
@@ -193,13 +182,13 @@ _nvkm_falcon_init(struct nvkm_object *object)
        /* upload firmware bootloader (or the full code segments) */
        if (falcon->core) {
                if (device->card_type < NV_C0)
-                       nv_wo32(falcon, 0x618, 0x04000000);
+                       nvkm_wr32(device, base + 0x618, 0x04000000);
                else
-                       nv_wo32(falcon, 0x618, 0x00000114);
-               nv_wo32(falcon, 0x11c, 0);
-               nv_wo32(falcon, 0x110, falcon->core->addr >> 8);
-               nv_wo32(falcon, 0x114, 0);
-               nv_wo32(falcon, 0x118, 0x00006610);
+                       nvkm_wr32(device, base + 0x618, 0x00000114);
+               nvkm_wr32(device, base + 0x11c, 0);
+               nvkm_wr32(device, base + 0x110, falcon->core->addr >> 8);
+               nvkm_wr32(device, base + 0x114, 0);
+               nvkm_wr32(device, base + 0x118, 0x00006610);
        } else {
                if (falcon->code.size > falcon->code.limit ||
                    falcon->data.size > falcon->data.limit) {
@@ -208,39 +197,39 @@ _nvkm_falcon_init(struct nvkm_object *object)
                }
 
                if (falcon->version < 3) {
-                       nv_wo32(falcon, 0xff8, 0x00100000);
+                       nvkm_wr32(device, base + 0xff8, 0x00100000);
                        for (i = 0; i < falcon->code.size / 4; i++)
-                               nv_wo32(falcon, 0xff4, falcon->code.data[i]);
+                               nvkm_wr32(device, base + 0xff4, falcon->code.data[i]);
                } else {
-                       nv_wo32(falcon, 0x180, 0x01000000);
+                       nvkm_wr32(device, base + 0x180, 0x01000000);
                        for (i = 0; i < falcon->code.size / 4; i++) {
                                if ((i & 0x3f) == 0)
-                                       nv_wo32(falcon, 0x188, i >> 6);
-                               nv_wo32(falcon, 0x184, falcon->code.data[i]);
+                                       nvkm_wr32(device, base + 0x188, i >> 6);
+                               nvkm_wr32(device, base + 0x184, falcon->code.data[i]);
                        }
                }
        }
 
        /* upload data segment (if necessary), zeroing the remainder */
        if (falcon->version < 3) {
-               nv_wo32(falcon, 0xff8, 0x00000000);
+               nvkm_wr32(device, base + 0xff8, 0x00000000);
                for (i = 0; !falcon->core && i < falcon->data.size / 4; i++)
-                       nv_wo32(falcon, 0xff4, falcon->data.data[i]);
+                       nvkm_wr32(device, base + 0xff4, falcon->data.data[i]);
                for (; i < falcon->data.limit; i += 4)
-                       nv_wo32(falcon, 0xff4, 0x00000000);
+                       nvkm_wr32(device, base + 0xff4, 0x00000000);
        } else {
-               nv_wo32(falcon, 0x1c0, 0x01000000);
+               nvkm_wr32(device, base + 0x1c0, 0x01000000);
                for (i = 0; !falcon->core && i < falcon->data.size / 4; i++)
-                       nv_wo32(falcon, 0x1c4, falcon->data.data[i]);
+                       nvkm_wr32(device, base + 0x1c4, falcon->data.data[i]);
                for (; i < falcon->data.limit / 4; i++)
-                       nv_wo32(falcon, 0x1c4, 0x00000000);
+                       nvkm_wr32(device, base + 0x1c4, 0x00000000);
        }
 
        /* start it running */
-       nv_wo32(falcon, 0x10c, 0x00000001); /* BLOCK_ON_FIFO */
-       nv_wo32(falcon, 0x104, 0x00000000); /* ENTRY */
-       nv_wo32(falcon, 0x100, 0x00000002); /* TRIGGER */
-       nv_wo32(falcon, 0x048, 0x00000003); /* FIFO | CHSW */
+       nvkm_wr32(device, base + 0x10c, 0x00000001); /* BLOCK_ON_FIFO */
+       nvkm_wr32(device, base + 0x104, 0x00000000); /* ENTRY */
+       nvkm_wr32(device, base + 0x100, 0x00000002); /* TRIGGER */
+       nvkm_wr32(device, base + 0x048, 0x00000003); /* FIFO | CHSW */
        return 0;
 }
 
@@ -248,6 +237,8 @@ int
 _nvkm_falcon_fini(struct nvkm_object *object, bool suspend)
 {
        struct nvkm_falcon *falcon = (void *)object;
+       struct nvkm_device *device = falcon->engine.subdev.device;
+       const u32 base = falcon->addr;
 
        if (!suspend) {
                nvkm_gpuobj_ref(NULL, &falcon->core);
@@ -258,8 +249,8 @@ _nvkm_falcon_fini(struct nvkm_object *object, bool suspend)
                }
        }
 
-       nv_mo32(falcon, 0x048, 0x00000003, 0x00000000);
-       nv_wo32(falcon, 0x014, 0xffffffff);
+       nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
+       nvkm_wr32(device, base + 0x014, 0xffffffff);
 
        return nvkm_engine_fini(&falcon->engine, suspend);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
index f83d020f05de5cdad6faf13f2fed57d0b58a9e77..c8a1a1288af6e216aaaec5f238b9b714a50b5fc8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
@@ -100,7 +100,5 @@ g98_mspdec_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = g98_mspdec_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
index 9bbeede03e068fe2ba5ef0e1e3f9bb45b390a89b..4b759f3e8f51be1152c2ae4bc57993aa19781271 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
@@ -100,7 +100,5 @@ gf100_mspdec_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = gf100_mspdec_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
index fb742b442ce98c13102a21ae947b37635ae82432..ab2923634644e9dd3f45f2ec226213ad1dd4112d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
@@ -100,7 +100,5 @@ gk104_mspdec_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = gk104_mspdec_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c
index d681fe63b1bce5b009a62dfff9c04611562b6bb4..80b12ab0978140f98e5c39aec25e76c0f329bcd5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c
@@ -100,7 +100,5 @@ g98_msppp_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = g98_msppp_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c
index 7e61f092ef4ab62bce317a47ebee72c348993917..5f5018bf828091a7324123b93ac9d8e59044a347 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c
@@ -100,7 +100,5 @@ gf100_msppp_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = gf100_msppp_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
index c7d981cad8226f8853375888056aa18ab7af6d21..5312cd605dd7a00799a83a59e3134831edd6b360 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
@@ -101,7 +101,5 @@ g98_msvld_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = g98_msvld_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
index 156ebcf22a27f296ba48e1efc776184f8e7d766a..e5de6db866cfdbb388c41719844ed7c1fd0bd6d3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
@@ -100,7 +100,5 @@ gf100_msvld_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = gf100_msvld_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
index 870e61465b07fe785f8e25711afe3d7f5920d944..0858765c5201c3d4c2dd7b3270da8767ca5127ce 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
@@ -100,7 +100,5 @@ gk104_msvld_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = gk104_msvld_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c
index b60719092154c65bdf54ab3bf9848df9e28eac1f..431bd5aa6c3d12f09e17aaabc0340fe7bd616440 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c
@@ -142,7 +142,5 @@ g98_sec_oclass = {
                .dtor = _nvkm_falcon_dtor,
                .init = _nvkm_falcon_init,
                .fini = _nvkm_falcon_fini,
-               .rd32 = _nvkm_falcon_rd32,
-               .wr32 = _nvkm_falcon_wr32,
        },
 };