drm/nouveau/gr/gf100-: virtualise r418e94

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 d2b78ed6556aaa9f9dbb6075c7e95f89e5be3b10..24792be61f9b9a24b3f70431a0d1ea7a76d58dd0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1432,6 +1432,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
                grctx->r419eb0(gr);
        if (grctx->r419e00)
                grctx->r419e00(gr);
+       if (grctx->r418e94)
+               grctx->r418e94(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 474b5ddba4ed967ba6c4e51cc3f830ec2294a5a0..ac7f4f52b707b42be2957143f5946217990813ad 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
@@ -68,6 +68,7 @@ struct gf100_grctx_func {
        void (*r418800)(struct gf100_gr *);
        void (*r419eb0)(struct gf100_gr *);
        void (*r419e00)(struct gf100_gr *);
+       void (*r418e94)(struct gf100_gr *);
 };
 
 extern const struct gf100_grctx_func gf100_grctx;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
index f1e87b97480d94e2212ed5dddac2b6d623d130df..13951aa41ba429161f03bfeefb17567fa12bbeb5 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,14 @@
  * PGRAPH context implementation
  ******************************************************************************/
 
+static void
+gm200_grctx_generate_r418e94(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       nvkm_mask(device, 0x418e94, 0xffffffff, 0xc4230000);
+       nvkm_mask(device, 0x418e4c, 0xffffffff, 0x70000000);
+}
+
 void
 gm200_grctx_generate_smid_config(struct gf100_gr *gr)
 {
@@ -96,8 +104,7 @@ gm200_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        nvkm_wr32(device, 0x404154, idle_timeout);
        gf100_gr_mthd(gr, gr->fuc_method);
 
-       nvkm_mask(device, 0x418e94, 0xffffffff, 0xc4230000);
-       nvkm_mask(device, 0x418e4c, 0xffffffff, 0x70000000);
+       grctx->r418e94(gr);
 }
 
 void
@@ -144,4 +151,5 @@ gm200_grctx = {
        .gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,
        .tpc_mask = gm200_grctx_generate_tpc_mask,
        .smid_config = gm200_grctx_generate_smid_config,
+       .r418e94 = gm200_grctx_generate_r418e94,
 };