drm/nouveau/gr/gf100-: virtualise r419f78 + apply fixes from traces

Removed from GK110[B]/GK208 as RM traces show it not being touched.

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 c1c83e5bf0a9074af1900af36452873507eb6367..3793d481e851e542f429f35cd07963edcce453ed 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1366,6 +1366,8 @@ gf100_grctx_generate_floorsweep(struct gf100_gr *gr)
                func->r406500(gr);
        if (func->gpc_tpc_nr)
                func->gpc_tpc_nr(gr);
+       if (func->r419f78)
+               func->r419f78(gr);
 }
 
 void

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
index c91904d11b244137850b1e1f0b2e7f83e81c5b7b..e84b46f6210dc7c3346b39176bb22fe79a3ba86b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
@@ -60,6 +60,7 @@ struct gf100_grctx_func {
        void (*dist_skip_table)(struct gf100_gr *);
        void (*r406500)(struct gf100_gr *);
        void (*gpc_tpc_nr)(struct gf100_gr *);
+       void (*r419f78)(struct gf100_gr *);
 };
 
 extern const struct gf100_grctx_func gf100_grctx;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
index 302b8c7b68a885b5104a28577a17e20ff1be9449..f527bca30a02eb3f9a2e07be20a38bb6a71c52fa 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
@@ -892,6 +892,13 @@ gk104_grctx_generate_unkn(struct gf100_gr *gr)
        nvkm_mask(device, 0x419c00, 0x00000008, 0x00000008);
 }
 
+static void
+gk104_grctx_generate_r419f78(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       nvkm_mask(device, 0x419f78, 0x00000001, 0x00000000);
+}
+
 void
 gk104_grctx_generate_gpc_tpc_nr(struct gf100_gr *gr)
 {
@@ -923,8 +930,6 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 
        gf100_grctx_generate_floorsweep(gr);
 
-       nvkm_mask(device, 0x419f78, 0x00000001, 0x00000000);
-
        gf100_gr_icmd(gr, grctx->icmd);
        nvkm_wr32(device, 0x404154, idle_timeout);
        gf100_gr_mthd(gr, grctx->mthd);
@@ -1010,4 +1015,5 @@ gk104_grctx = {
        .alpha_beta_tables = gk104_grctx_generate_alpha_beta_tables,
        .dist_skip_table = gf117_grctx_generate_dist_skip_table,
        .gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
+       .r419f78 = gk104_grctx_generate_r419f78,
 };