drm/nouveau/gr/gf100-: update 419a3c where required

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 24792be61f9b9a24b3f70431a0d1ea7a76d58dd0..1d1d0ccd1ddc60f8f79a8158650184c45799f470 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1434,6 +1434,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
                grctx->r419e00(gr);
        if (grctx->r418e94)
                grctx->r418e94(gr);
+       if (grctx->r419a3c)
+               grctx->r419a3c(gr);
 }
 
 #define CB_RESERVED 0x80000

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
index ac7f4f52b707b42be2957143f5946217990813ad..bff24e66d39ee8b9806ef6932651520cae40113a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
@@ -69,6 +69,7 @@ struct gf100_grctx_func {
        void (*r419eb0)(struct gf100_gr *);
        void (*r419e00)(struct gf100_gr *);
        void (*r418e94)(struct gf100_gr *);
+       void (*r419a3c)(struct gf100_gr *);
 };
 
 extern const struct gf100_grctx_func gf100_grctx;
@@ -130,6 +131,7 @@ void gm200_grctx_generate_dist_skip_table(struct gf100_gr *);
 void gm200_grctx_generate_r406500(struct gf100_gr *);
 void gm200_grctx_generate_tpc_mask(struct gf100_gr *);
 void gm200_grctx_generate_smid_config(struct gf100_gr *);
+void gm200_grctx_generate_r419a3c(struct gf100_gr *);
 
 extern const struct gf100_grctx_func gm20b_grctx;
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
index 13951aa41ba429161f03bfeefb17567fa12bbeb5..7a9be045e684e227e0ce2eb523bfde5f1d07375e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
@@ -27,6 +27,13 @@
  * PGRAPH context implementation
  ******************************************************************************/
 
+void
+gm200_grctx_generate_r419a3c(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       nvkm_mask(device, 0x419a3c, 0x00000014, 0x00000000);
+}
+
 static void
 gm200_grctx_generate_r418e94(struct gf100_gr *gr)
 {
@@ -152,4 +159,5 @@ gm200_grctx = {
        .tpc_mask = gm200_grctx_generate_tpc_mask,
        .smid_config = gm200_grctx_generate_smid_config,
        .r418e94 = gm200_grctx_generate_r418e94,
+       .r419a3c = gm200_grctx_generate_r419a3c,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
index 821219a041971aa73e8e683ef36768ac34fbd068..c60f9244fd7c09fa1b3eea18d5c1fd044d7123ac 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
@@ -165,4 +165,5 @@ gp100_grctx = {
        .gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
        .tpc_mask = gm200_grctx_generate_tpc_mask,
        .smid_config = gp100_grctx_generate_smid_config,
+       .r419a3c = gm200_grctx_generate_r419a3c,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
index 611819ffb1f83a260d4057f5d41af48feb1d557b..3af42c14c8f320c6f3d373f0482fde8273bbbb1c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
@@ -101,4 +101,5 @@ gp102_grctx = {
        .gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
        .tpc_mask = gm200_grctx_generate_tpc_mask,
        .smid_config = gp100_grctx_generate_smid_config,
+       .r419a3c = gm200_grctx_generate_r419a3c,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
index d908317079e038fe1308b90f963717280f50c6a4..1864674e5824bad840825afd87d977f27c29c6c0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
@@ -51,4 +51,5 @@ gp107_grctx = {
        .gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
        .tpc_mask = gm200_grctx_generate_tpc_mask,
        .smid_config = gp100_grctx_generate_smid_config,
+       .r419a3c = gm200_grctx_generate_r419a3c,
 };