drm/nouveau/gr/gf100-: virtualise r406500

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 176be7124f2907b602f3e3c1c0d76f6953d75464..7bd28c1bb289ad1fbc87a3f473e968cfac81fd1d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1362,6 +1362,8 @@ gf100_grctx_generate_floorsweep(struct gf100_gr *gr)
                func->max_ways_evict(gr);
        if (func->dist_skip_table)
                func->dist_skip_table(gr);
+       if (func->r406500)
+               func->r406500(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 dd1c73b725cde0e271ddf1772b8046155cd71e17..7d949a54f95815e2214e9007c905d8560afad022 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
@@ -58,6 +58,7 @@ struct gf100_grctx_func {
        void (*alpha_beta_tables)(struct gf100_gr *);
        void (*max_ways_evict)(struct gf100_gr *);
        void (*dist_skip_table)(struct gf100_gr *);
+       void (*r406500)(struct gf100_gr *);
 };
 
 extern const struct gf100_grctx_func gf100_grctx;
@@ -115,6 +116,7 @@ void gm107_grctx_generate_attrib(struct gf100_grctx *);
 
 extern const struct gf100_grctx_func gm200_grctx;
 void gm200_grctx_generate_dist_skip_table(struct gf100_gr *);
+void gm200_grctx_generate_r406500(struct gf100_gr *);
 void gm200_grctx_generate_405b60(struct gf100_gr *);
 
 extern const struct gf100_grctx_func gm20b_grctx;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
index cdf9d60683e01ed9bad7eac257db363a18f34dd9..aa5fff3c0d7489c8665434346889670773ffb569 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
@@ -930,6 +930,12 @@ gm107_grctx_generate_attrib(struct gf100_grctx *info)
        }
 }
 
+static void
+gm107_grctx_generate_r406500(struct gf100_gr *gr)
+{
+       nvkm_wr32(gr->base.engine.subdev.device, 0x406500, 0x00000001);
+}
+
 void
 gm107_grctx_generate_sm_id(struct gf100_gr *gr, int gpc, int tpc, int sm)
 {
@@ -961,8 +967,6 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 
        gf100_grctx_generate_floorsweep(gr);
 
-       nvkm_wr32(device, 0x406500, 0x00000001);
-
        nvkm_wr32(device, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
 
        gf100_gr_icmd(gr, grctx->icmd);
@@ -1002,4 +1006,5 @@ gm107_grctx = {
        .rop_mapping = gf117_grctx_generate_rop_mapping,
        .alpha_beta_tables = gk104_grctx_generate_alpha_beta_tables,
        .dist_skip_table = gf117_grctx_generate_dist_skip_table,
+       .r406500 = gm107_grctx_generate_r406500,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
index 689120683fb47dbc14be8acebad76ed929bc59f7..9c4db049f9c969c025ed835b2e262f91cc6ef695 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
@@ -59,6 +59,12 @@ gm200_grctx_generate_405b60(struct gf100_gr *gr)
                nvkm_wr32(device, 0x405ba0 + (i * 4), gpcs[i]);
 }
 
+void
+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)
 {
@@ -78,8 +84,6 @@ gm200_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 
        gf100_grctx_generate_floorsweep(gr);
 
-       nvkm_wr32(device, 0x406500, 0x00000000);
-
        nvkm_wr32(device, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
 
        for (tmp = 0, i = 0; i < gr->gpc_nr; i++)
@@ -136,4 +140,5 @@ gm200_grctx = {
        .sm_id = gm107_grctx_generate_sm_id,
        .rop_mapping = gf117_grctx_generate_rop_mapping,
        .dist_skip_table = gm200_grctx_generate_dist_skip_table,
+       .r406500 = gm200_grctx_generate_r406500,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
index 1a3d0c566fea461d969d663215c0272aca83bf9f..3bad1a573ee3b9aa8cb34c7a2020aebe88200cf7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
@@ -140,8 +140,6 @@ gp100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 
        gf100_grctx_generate_floorsweep(gr);
 
-       nvkm_wr32(device, 0x406500, 0x00000000);
-
        nvkm_wr32(device, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
 
        for (tmp = 0, i = 0; i < gr->gpc_nr; i++)
@@ -173,4 +171,5 @@ gp100_grctx = {
        .sm_id = gm107_grctx_generate_sm_id,
        .rop_mapping = gf117_grctx_generate_rop_mapping,
        .dist_skip_table = gm200_grctx_generate_dist_skip_table,
+       .r406500 = gm200_grctx_generate_r406500,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
index 2aeabb362447092ecc29bb9f13a679519c0cc93a..dea009702cc407af2cb5bfd3098375b4d9c7ee4e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
@@ -97,4 +97,5 @@ gp102_grctx = {
        .sm_id = gm107_grctx_generate_sm_id,
        .rop_mapping = gf117_grctx_generate_rop_mapping,
        .dist_skip_table = gm200_grctx_generate_dist_skip_table,
+       .r406500 = gm200_grctx_generate_r406500,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
index 4aea2f6552cc17a1e0eaf1a1f7096daed80ec1a9..a97c4b02acb47b3cafcb0565ba55ee0eb55a1e56 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
@@ -47,4 +47,5 @@ gp107_grctx = {
        .sm_id = gm107_grctx_generate_sm_id,
        .rop_mapping = gf117_grctx_generate_rop_mapping,
        .dist_skip_table = gm200_grctx_generate_dist_skip_table,
+       .r406500 = gm200_grctx_generate_r406500,
 };