drm/nouveau/gr/gf100-: drop fuc_ prefix on sw init

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
index 284d7e0..4338e51 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1368,7 +1368,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 
        nvkm_mc_unk260(device, 0);
 
-       if (!gr->fuc_sw_ctx) {
+       if (!gr->sw_ctx) {
                gf100_gr_mmio(gr, grctx->hub);
                gf100_gr_mmio(gr, grctx->gpc_0);
                gf100_gr_mmio(gr, grctx->zcull);
@@ -1376,7 +1376,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
                gf100_gr_mmio(gr, grctx->tpc);
                gf100_gr_mmio(gr, grctx->ppc);
        } else {
-               gf100_gr_mmio(gr, gr->fuc_sw_ctx);
+               gf100_gr_mmio(gr, gr->sw_ctx);
        }
 
        gf100_gr_wait_idle(gr);
@@ -1395,8 +1395,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        gf100_gr_wait_idle(gr);
 
        if (grctx->r400088) grctx->r400088(gr, false);
-       if (gr->fuc_bundle)
-               gf100_gr_icmd(gr, gr->fuc_bundle);
+       if (gr->bundle)
+               gf100_gr_icmd(gr, gr->bundle);
        else
                gf100_gr_icmd(gr, grctx->icmd);
        if (grctx->sw_veid_bundle_init)
@@ -1405,8 +1405,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 
        nvkm_wr32(device, 0x404154, idle_timeout);
 
-       if (gr->fuc_method)
-               gf100_gr_mthd(gr, gr->fuc_method);
+       if (gr->method)
+               gf100_gr_mthd(gr, gr->method);
        else
                gf100_gr_mthd(gr, grctx->mthd);
        nvkm_mc_unk260(device, 1);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
index 896d473..c0d36bc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
@@ -32,7 +32,7 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        u32 idle_timeout;
        int i;
 
-       gf100_gr_mmio(gr, gr->fuc_sw_ctx);
+       gf100_gr_mmio(gr, gr->sw_ctx);
 
        gf100_gr_wait_idle(gr);
 
@@ -56,10 +56,10 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        nvkm_wr32(device, 0x404154, idle_timeout);
        gf100_gr_wait_idle(gr);
 
-       gf100_gr_mthd(gr, gr->fuc_method);
+       gf100_gr_mthd(gr, gr->method);
        gf100_gr_wait_idle(gr);
 
-       gf100_gr_icmd(gr, gr->fuc_bundle);
+       gf100_gr_icmd(gr, gr->bundle);
        grctx->pagepool(info);
        grctx->bundle(info);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
index a1d9e11..6b92f8a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
@@ -29,7 +29,7 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        u32 idle_timeout;
        int i, tmp;
 
-       gf100_gr_mmio(gr, gr->fuc_sw_ctx);
+       gf100_gr_mmio(gr, gr->sw_ctx);
 
        gf100_gr_wait_idle(gr);
 
@@ -59,10 +59,10 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        nvkm_wr32(device, 0x404154, idle_timeout);
        gf100_gr_wait_idle(gr);
 
-       gf100_gr_mthd(gr, gr->fuc_method);
+       gf100_gr_mthd(gr, gr->method);
        gf100_gr_wait_idle(gr);
 
-       gf100_gr_icmd(gr, gr->fuc_bundle);
+       gf100_gr_icmd(gr, gr->bundle);
        grctx->pagepool(info);
        grctx->bundle(info);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index a9d4b60..f0925d4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -2013,12 +2013,6 @@ gf100_gr_fini_(struct nvkm_gr *base, bool suspend)
        return 0;
 }
 
-static void
-gf100_gr_dtor_init(struct gf100_gr_pack *pack)
-{
-       vfree(pack);
-}
-
 void *
 gf100_gr_dtor(struct nvkm_gr *base)
 {
@@ -2034,10 +2028,10 @@ gf100_gr_dtor(struct nvkm_gr *base)
        nvkm_blob_dtor(&gr->fuc41ac);
        nvkm_blob_dtor(&gr->fuc41ad);
 
-       gf100_gr_dtor_init(gr->fuc_bundle);
-       gf100_gr_dtor_init(gr->fuc_method);
-       gf100_gr_dtor_init(gr->fuc_sw_ctx);
-       gf100_gr_dtor_init(gr->fuc_sw_nonctx);
+       vfree(gr->bundle);
+       vfree(gr->method);
+       vfree(gr->sw_ctx);
+       vfree(gr->sw_nonctx);
 
        return gr;
 }
@@ -2303,8 +2297,8 @@ gf100_gr_init(struct gf100_gr *gr)
 
        gr->func->init_gpc_mmu(gr);
 
-       if (gr->fuc_sw_nonctx)
-               gf100_gr_mmio(gr, gr->fuc_sw_nonctx);
+       if (gr->sw_nonctx)
+               gf100_gr_mmio(gr, gr->sw_nonctx);
        else
                gf100_gr_mmio(gr, gr->func->mmio);
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
index 231fe7e..bece3c7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
@@ -97,10 +97,10 @@ struct gf100_gr {
         * Used if the register packs are loaded from NVIDIA fw instead of
         * using hardcoded arrays. To be allocated with vzalloc().
         */
-       struct gf100_gr_pack *fuc_sw_nonctx;
-       struct gf100_gr_pack *fuc_sw_ctx;
-       struct gf100_gr_pack *fuc_bundle;
-       struct gf100_gr_pack *fuc_method;
+       struct gf100_gr_pack *sw_nonctx;
+       struct gf100_gr_pack *sw_ctx;
+       struct gf100_gr_pack *bundle;
+       struct gf100_gr_pack *method;
 
        struct gf100_gr_zbc_color zbc_color[NVKM_LTC_MAX_ZBC_CNT];
        struct gf100_gr_zbc_depth zbc_depth[NVKM_LTC_MAX_ZBC_CNT];

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
index 357870c..a6ee5d6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
@@ -229,7 +229,7 @@ gk20a_gr_init(struct gf100_gr *gr)
        /* Clear SCC RAM */
        nvkm_wr32(device, 0x40802c, 0x1);
 
-       gf100_gr_mmio(gr, gr->fuc_sw_nonctx);
+       gf100_gr_mmio(gr, gr->sw_nonctx);
 
        ret = gk20a_gr_wait_mem_scrubbing(gr);
        if (ret)
@@ -310,10 +310,10 @@ gk20a_gr = {
 int
 gk20a_gr_load_sw(struct gf100_gr *gr, const char *path, int ver)
 {
-       if (gk20a_gr_av_to_init(gr, path, "sw_nonctx", ver, &gr->fuc_sw_nonctx) ||
-           gk20a_gr_aiv_to_init(gr, path, "sw_ctx", ver, &gr->fuc_sw_ctx) ||
-           gk20a_gr_av_to_init(gr, path, "sw_bundle_init", ver, &gr->fuc_bundle) ||
-           gk20a_gr_av_to_method(gr, path, "sw_method_init", ver, &gr->fuc_method))
+       if (gk20a_gr_av_to_init(gr, path, "sw_nonctx", ver, &gr->sw_nonctx) ||
+           gk20a_gr_aiv_to_init(gr, path, "sw_ctx", ver, &gr->sw_ctx) ||
+           gk20a_gr_av_to_init(gr, path, "sw_bundle_init", ver, &gr->bundle) ||
+           gk20a_gr_av_to_method(gr, path, "sw_method_init", ver, &gr->method))
                return -ENOENT;
 
        return 0;