drm/nouveau/gr/gf100-: delete duplicated grctx init code

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
index 668b2c71ff42975223054606c734cb18d815ce0a..be57ff086022927b84cad4e8a3d699e144061201 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
@@ -108,7 +108,6 @@ void gk104_grctx_generate_alpha_beta_tables(struct gf100_gr *);
 void gk104_grctx_generate_gpc_tpc_nr(struct gf100_gr *);
 
 extern const struct gf100_grctx_func gk20a_grctx;
-void gk104_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);
 void gk104_grctx_generate_bundle(struct gf100_grctx *);
 void gk104_grctx_generate_pagepool(struct gf100_grctx *);
 void gk104_grctx_generate_patch_ltc(struct gf100_grctx *);
@@ -137,7 +136,6 @@ void gm200_grctx_generate_r419a3c(struct gf100_gr *);
 extern const struct gf100_grctx_func gm20b_grctx;
 
 extern const struct gf100_grctx_func gp100_grctx;
-void gp100_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);
 void gp100_grctx_generate_pagepool(struct gf100_grctx *);
 void gp100_grctx_generate_smid_config(struct gf100_gr *);
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
index e922e3e983cfc99551cb02234529e4f24b3e012c..4b7b4f8f75fd6c7c2ac82048eac5d6be0daa9a4a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
@@ -286,39 +286,9 @@ gf117_grctx_generate_attrib(struct gf100_grctx *info)
        }
 }
 
-static void
-gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
-{
-       struct nvkm_device *device = gr->base.engine.subdev.device;
-       const struct gf100_grctx_func *grctx = gr->func->grctx;
-       u32 idle_timeout;
-
-       nvkm_mc_unk260(device, 0);
-
-       gf100_gr_mmio(gr, grctx->hub);
-       gf100_gr_mmio(gr, grctx->gpc);
-       gf100_gr_mmio(gr, grctx->zcull);
-       gf100_gr_mmio(gr, grctx->tpc);
-       gf100_gr_mmio(gr, grctx->ppc);
-
-       idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);
-
-       grctx->bundle(info);
-       grctx->pagepool(info);
-       grctx->attrib(info);
-       grctx->unkn(gr);
-
-       gf100_grctx_generate_floorsweep(gr);
-
-       gf100_gr_icmd(gr, grctx->icmd);
-       nvkm_wr32(device, 0x404154, idle_timeout);
-       gf100_gr_mthd(gr, grctx->mthd);
-       nvkm_mc_unk260(device, 1);
-}
-
 const struct gf100_grctx_func
 gf117_grctx = {
-       .main  = gf117_grctx_generate_main,
+       .main  = gf100_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .hub   = gf117_grctx_pack_hub,
        .gpc   = gf117_grctx_pack_gpc,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
index a4fe36c136fdc14fb7c9fe8508b61856ff50a352..bdf2a1e6d3b6ae454038bc21794613243f0ad139 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
@@ -921,38 +921,6 @@ gk104_grctx_generate_gpc_tpc_nr(struct gf100_gr *gr)
        nvkm_wr32(device, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
 }
 
-void
-gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
-{
-       struct nvkm_device *device = gr->base.engine.subdev.device;
-       const struct gf100_grctx_func *grctx = gr->func->grctx;
-       u32 idle_timeout;
-
-       nvkm_mc_unk260(device, 0);
-
-       gf100_gr_mmio(gr, grctx->hub);
-       gf100_gr_mmio(gr, grctx->gpc);
-       gf100_gr_mmio(gr, grctx->zcull);
-       gf100_gr_mmio(gr, grctx->tpc);
-       gf100_gr_mmio(gr, grctx->ppc);
-
-       idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);
-
-       grctx->bundle(info);
-       grctx->pagepool(info);
-       grctx->attrib(info);
-       grctx->unkn(gr);
-
-       gf100_grctx_generate_floorsweep(gr);
-
-       gf100_gr_icmd(gr, grctx->icmd);
-       nvkm_wr32(device, 0x404154, idle_timeout);
-       gf100_gr_mthd(gr, grctx->mthd);
-       nvkm_mc_unk260(device, 1);
-
-       grctx->r418800(gr);
-}
-
 void
 gk104_grctx_generate_alpha_beta_tables(struct gf100_gr *gr)
 {
@@ -1002,7 +970,7 @@ gk104_grctx_generate_alpha_beta_tables(struct gf100_gr *gr)
 
 const struct gf100_grctx_func
 gk104_grctx = {
-       .main  = gk104_grctx_generate_main,
+       .main  = gf100_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .hub   = gk104_grctx_pack_hub,
        .gpc   = gk104_grctx_pack_gpc,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c
index f00e7afef9c444a355563677dec21a0ee09fc878..2ba35d727dc1db8f5c9a6871b30db75a3d476602 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c
@@ -817,7 +817,7 @@ gk110_grctx_generate_r419eb0(struct gf100_gr *gr)
 
 const struct gf100_grctx_func
 gk110_grctx = {
-       .main  = gk104_grctx_generate_main,
+       .main  = gf100_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .hub   = gk110_grctx_pack_hub,
        .gpc   = gk110_grctx_pack_gpc,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c
index ed09cfdfb024bce6ee646740df2317beaca2a01e..1112f8dc70e2c2678d08deed6433ad06ce2d5dba 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c
@@ -71,7 +71,7 @@ gk110b_grctx_pack_tpc[] = {
 
 const struct gf100_grctx_func
 gk110b_grctx = {
-       .main  = gk104_grctx_generate_main,
+       .main  = gf100_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .hub   = gk110_grctx_pack_hub,
        .gpc   = gk110_grctx_pack_gpc,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c
index c69494f7418ef4ae4df4f4dfeb648a04a26b8f3e..613c5cf8b3bf7d7cf3d231c7b254a6c8dc0771da 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c
@@ -532,7 +532,7 @@ gk208_grctx_pack_ppc[] = {
 
 const struct gf100_grctx_func
 gk208_grctx = {
-       .main  = gk104_grctx_generate_main,
+       .main  = gf100_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .hub   = gk208_grctx_pack_hub,
        .gpc   = gk208_grctx_pack_gpc,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
index 12a9431dc8b42f51c7430a3fc418abe1ae9d49b2..7816dcb7c9743a8f479243aa0846de4f2cf375ca 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
@@ -955,38 +955,9 @@ gm107_grctx_generate_sm_id(struct gf100_gr *gr, int gpc, int tpc, int sm)
        nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x088), sm);
 }
 
-static void
-gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
-{
-       struct nvkm_device *device = gr->base.engine.subdev.device;
-       const struct gf100_grctx_func *grctx = gr->func->grctx;
-       u32 idle_timeout;
-
-       gf100_gr_mmio(gr, grctx->hub);
-       gf100_gr_mmio(gr, grctx->gpc);
-       gf100_gr_mmio(gr, grctx->zcull);
-       gf100_gr_mmio(gr, grctx->tpc);
-       gf100_gr_mmio(gr, grctx->ppc);
-
-       idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);
-
-       grctx->bundle(info);
-       grctx->pagepool(info);
-       grctx->attrib(info);
-       grctx->unkn(gr);
-
-       gf100_grctx_generate_floorsweep(gr);
-
-       gf100_gr_icmd(gr, grctx->icmd);
-       nvkm_wr32(device, 0x404154, idle_timeout);
-       gf100_gr_mthd(gr, grctx->mthd);
-
-       grctx->r419e00(gr);
-}
-
 const struct gf100_grctx_func
 gm107_grctx = {
-       .main  = gm107_grctx_generate_main,
+       .main  = gf100_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .hub   = gm107_grctx_pack_hub,
        .gpc   = gm107_grctx_pack_gpc,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
index 7a9be045e684e227e0ce2eb523bfde5f1d07375e..7107ec4297783a1a8228fed2a1383563ce29d719 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
@@ -89,31 +89,6 @@ gm200_grctx_generate_r406500(struct gf100_gr *gr)
        nvkm_wr32(gr->base.engine.subdev.device, 0x406500, 0x00000000);
 }
 
-static void
-gm200_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
-{
-       struct nvkm_device *device = gr->base.engine.subdev.device;
-       const struct gf100_grctx_func *grctx = gr->func->grctx;
-       u32 idle_timeout;
-
-       gf100_gr_mmio(gr, gr->fuc_sw_ctx);
-
-       idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);
-
-       grctx->bundle(info);
-       grctx->pagepool(info);
-       grctx->attrib(info);
-       grctx->unkn(gr);
-
-       gf100_grctx_generate_floorsweep(gr);
-
-       gf100_gr_icmd(gr, gr->fuc_bundle);
-       nvkm_wr32(device, 0x404154, idle_timeout);
-       gf100_gr_mthd(gr, gr->fuc_method);
-
-       grctx->r418e94(gr);
-}
-
 void
 gm200_grctx_generate_dist_skip_table(struct gf100_gr *gr)
 {
@@ -138,7 +113,7 @@ gm200_grctx_generate_dist_skip_table(struct gf100_gr *gr)
 
 const struct gf100_grctx_func
 gm200_grctx = {
-       .main  = gm200_grctx_generate_main,
+       .main  = gf100_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .bundle = gm107_grctx_generate_bundle,
        .bundle_size = 0x3000,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
index c60f9244fd7c09fa1b3eea18d5c1fd044d7123ac..af6330c73872362e801df06569a354f0c42ae9b0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
@@ -120,32 +120,9 @@ gp100_grctx_generate_smid_config(struct gf100_gr *gr)
                nvkm_wr32(device, 0x405ba0 + (i * 4), gpcs[i]);
 }
 
-void
-gp100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
-{
-       struct nvkm_device *device = gr->base.engine.subdev.device;
-       const struct gf100_grctx_func *grctx = gr->func->grctx;
-       u32 idle_timeout;
-
-       gf100_gr_mmio(gr, gr->fuc_sw_ctx);
-
-       idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);
-
-       grctx->pagepool(info);
-       grctx->bundle(info);
-       grctx->attrib(info);
-       grctx->unkn(gr);
-
-       gf100_grctx_generate_floorsweep(gr);
-
-       gf100_gr_icmd(gr, gr->fuc_bundle);
-       nvkm_wr32(device, 0x404154, idle_timeout);
-       gf100_gr_mthd(gr, gr->fuc_method);
-}
-
 const struct gf100_grctx_func
 gp100_grctx = {
-       .main  = gp100_grctx_generate_main,
+       .main  = gf100_grctx_generate_main,
        .unkn  = gk104_grctx_generate_unkn,
        .bundle = gm107_grctx_generate_bundle,
        .bundle_size = 0x3000,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
index 3c78a6d1b1ba3410aa30bcf3d623124f609ab69e..8a438c2efc3e6ea5f2792dd5a24f06dd5aa36ebe 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
@@ -88,7 +88,7 @@ gp102_grctx_generate_attrib(struct gf100_grctx *info)
 
 const struct gf100_grctx_func
 gp102_grctx = {
-       .main = gp100_grctx_generate_main,
+       .main = gf100_grctx_generate_main,
        .unkn = gk104_grctx_generate_unkn,
        .bundle = gm107_grctx_generate_bundle,
        .bundle_size = 0x3000,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c
index 020cb041c5de74721bbf2b01173557cfc5f7e1a6..5f799c7369bbc24623134be8cd28e07c175ed947 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c
@@ -23,7 +23,7 @@
 
 const struct gf100_grctx_func
 gp104_grctx = {
-       .main = gp100_grctx_generate_main,
+       .main = gf100_grctx_generate_main,
        .unkn = gk104_grctx_generate_unkn,
        .bundle = gm107_grctx_generate_bundle,
        .bundle_size = 0x3000,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
index 1864674e5824bad840825afd87d977f27c29c6c0..a69e824676c9dd1cf80fcceca0c940a7f61f0006 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
@@ -31,7 +31,7 @@
 
 const struct gf100_grctx_func
 gp107_grctx = {
-       .main = gp100_grctx_generate_main,
+       .main = gf100_grctx_generate_main,
        .unkn = gk104_grctx_generate_unkn,
        .bundle = gm107_grctx_generate_bundle,
        .bundle_size = 0x3000,