drm/nouveau/gr/gf100-gf119: update 419cb8 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 5350ab0..e29ac88 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1025,6 +1025,13 @@ gf100_grctx_mmio_item(struct gf100_grctx *info, u32 addr, u32 data,
 }
 
 void
+gf100_grctx_generate_r419cb8(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       nvkm_mask(device, 0x419cb8, 0x00007c00, 0x00000000);
+}
+
+void
 gf100_grctx_generate_bundle(struct gf100_grctx *info)
 {
        const struct gf100_grctx_func *grctx = info->gr->func->grctx;
@@ -1416,6 +1423,9 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
        else
                gf100_gr_mthd(gr, grctx->mthd);
        nvkm_mc_unk260(device, 1);
+
+       if (grctx->r419cb8)
+               grctx->r419cb8(gr);
 }
 
 #define CB_RESERVED 0x80000
@@ -1564,4 +1574,5 @@ gf100_grctx = {
        .rop_mapping = gf100_grctx_generate_rop_mapping,
        .alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,
        .max_ways_evict = gf100_grctx_generate_max_ways_evict,
+       .r419cb8 = gf100_grctx_generate_r419cb8,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
index d319e76..67628b9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
@@ -63,6 +63,8 @@ struct gf100_grctx_func {
        void (*r419f78)(struct gf100_gr *);
        void (*tpc_mask)(struct gf100_gr *);
        void (*smid_config)(struct gf100_gr *);
+       /* misc other things */
+       void (*r419cb8)(struct gf100_gr *);
 };
 
 extern const struct gf100_grctx_func gf100_grctx;
@@ -79,6 +81,7 @@ void gf100_grctx_generate_r4060a8(struct gf100_gr *);
 void gf100_grctx_generate_rop_mapping(struct gf100_gr *);
 void gf100_grctx_generate_alpha_beta_tables(struct gf100_gr *);
 void gf100_grctx_generate_max_ways_evict(struct gf100_gr *);
+void gf100_grctx_generate_r419cb8(struct gf100_gr *);
 
 extern const struct gf100_grctx_func gf108_grctx;
 void gf108_grctx_generate_attrib(struct gf100_grctx *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c
index d246bb6..7f3b928 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c
@@ -102,4 +102,5 @@ gf104_grctx = {
        .rop_mapping = gf100_grctx_generate_rop_mapping,
        .alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,
        .max_ways_evict = gf100_grctx_generate_max_ways_evict,
+       .r419cb8 = gf100_grctx_generate_r419cb8,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c
index 3b6e645..369d64f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c
@@ -800,4 +800,5 @@ gf108_grctx = {
        .rop_mapping = gf100_grctx_generate_rop_mapping,
        .alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,
        .max_ways_evict = gf100_grctx_generate_max_ways_evict,
+       .r419cb8 = gf100_grctx_generate_r419cb8,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c
index b65a1f3..d59c248 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c
@@ -353,4 +353,5 @@ gf110_grctx = {
        .rop_mapping = gf100_grctx_generate_rop_mapping,
        .alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,
        .max_ways_evict = gf100_grctx_generate_max_ways_evict,
+       .r419cb8 = gf100_grctx_generate_r419cb8,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
index b3f4127..e922e3e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
@@ -343,4 +343,5 @@ gf117_grctx = {
        .alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,
        .max_ways_evict = gf100_grctx_generate_max_ways_evict,
        .dist_skip_table = gf117_grctx_generate_dist_skip_table,
+       .r419cb8 = gf100_grctx_generate_r419cb8,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c
index 6b2fcfe..cc1a935 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c
@@ -523,4 +523,5 @@ gf119_grctx = {
        .rop_mapping = gf100_grctx_generate_rop_mapping,
        .alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,
        .max_ways_evict = gf100_grctx_generate_max_ways_evict,
+       .r419cb8 = gf100_grctx_generate_r419cb8,
 };