drm/gf100-/gr: unhardcode bundle cb config

Should be the same values as before, except:

GF117 has smaller buffer allocated, as per register setup.
GK20A now uses values from Tegra driver, not GK104's.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

13 files changed, 100 insertions, 41 deletions

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk110b.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk110b.c
index 4ae70c11b6e6..b3f5ea66566e 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk110b.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk110b.c
@@ -91,4 +91,8 @@ gk110b_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .ppc   = nvf0_grctx_pack_ppc,
         .icmd  = nvf0_grctx_pack_icmd,
         .mthd  = nvf0_grctx_pack_mthd,
+        .bundle = nve4_grctx_generate_bundle,
+        .bundle_size = 0x3000,
+        .bundle_min_gpm_fifo_depth = 0x180,
+        .bundle_token_limit = 0x600,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c
index 224ee0287ab7..1ec78bdca4b1 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c
@@ -50,4 +50,8 @@ gk20a_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .ppc   = nve4_grctx_pack_ppc,
         .icmd  = nve4_grctx_pack_icmd,
         .mthd  = gk20a_grctx_pack_mthd,
+        .bundle = nve4_grctx_generate_bundle,
+        .bundle_size = 0x1800,
+        .bundle_min_gpm_fifo_depth = 0x62,
+        .bundle_token_limit = 0x100,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c
index b0d0fb2f4d08..a4f008855966 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c
@@ -859,9 +859,25 @@ gm107_grctx_pack_ppc[] = {
  ******************************************************************************/
 
 static void
+gm107_grctx_generate_bundle(struct nvc0_grctx *info)
+{
+        const struct nvc0_grctx_oclass *impl = nvc0_grctx_impl(info->priv);
+        const u32 state_limit = min(impl->bundle_min_gpm_fifo_depth,
+                                    impl->bundle_size / 0x20);
+        const u32 token_limit = impl->bundle_token_limit;
+        const u32 access = NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS;
+        const int s = 8;
+        const int b = mmio_vram(info, impl->bundle_size, (1 << s), access);
+        mmio_refn(info, 0x408004, 0x00000000, s, b);
+        mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b);
+        mmio_refn(info, 0x418e24, 0x00000000, s, b);
+        mmio_refn(info, 0x418e28, 0x80000000 | (impl->bundle_size >> s), 0, b);
+        mmio_wr32(info, 0x4064c8, (state_limit << 16) | token_limit);
+}
+
+static void
 gm107_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 {
-        mmio_data(0x003000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x008000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x200000, 0x1000, NV_MEM_ACCESS_RW);
 
@@ -872,13 +888,6 @@ gm107_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         mmio_list(0x4064cc, 0x80000000,  0, 0);
         mmio_list(0x418e30, 0x80000000,  0, 0);
 
-        mmio_list(0x408004, 0x00000000,  8, 0);
-        mmio_list(0x408008, 0x80000030,  0, 0);
-        mmio_list(0x418e24, 0x00000000,  8, 0);
-        mmio_list(0x418e28, 0x80000030,  0, 0);
-
-        mmio_list(0x4064c8, 0x018002c0,  0, 0);
-
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
         mmio_list(0x419c2c, 0x10000000, 12, 2);
@@ -934,6 +943,7 @@ gm107_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 
         nv_wr32(priv, 0x404154, 0x00000000);
 
+        oclass->bundle(info);
         oclass->mods(priv, info);
         oclass->unkn(priv);
 
@@ -988,4 +998,8 @@ gm107_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .ppc   = gm107_grctx_pack_ppc,
         .icmd  = gm107_grctx_pack_icmd,
         .mthd  = gm107_grctx_pack_mthd,
+        .bundle = gm107_grctx_generate_bundle,
+        .bundle_size = 0x3000,
+        .bundle_min_gpm_fifo_depth = 0x180,
+        .bundle_token_limit = 0x2c0,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
index 8de4a4291548..c9eb8ed46d12 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
@@ -538,7 +538,6 @@ nv108_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         u32 offset;
         int gpc;
 
-        mmio_data(0x003000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x008000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x060000, 0x1000, NV_MEM_ACCESS_RW);
         mmio_list(0x40800c, 0x00000000,  8, 1);
@@ -546,11 +545,6 @@ nv108_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         mmio_list(0x419004, 0x00000000,  8, 1);
         mmio_list(0x419008, 0x00000000,  0, 0);
         mmio_list(0x4064cc, 0x80000000,  0, 0);
-        mmio_list(0x408004, 0x00000000,  8, 0);
-        mmio_list(0x408008, 0x80000030,  0, 0);
-        mmio_list(0x418808, 0x00000000,  8, 0);
-        mmio_list(0x41880c, 0x80000030,  0, 0);
-        mmio_list(0x4064c8, 0x00c20200,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -596,4 +590,8 @@ nv108_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .ppc   = nv108_grctx_pack_ppc,
         .icmd  = nv108_grctx_pack_icmd,
         .mthd  = nvf0_grctx_pack_mthd,
+        .bundle = nve4_grctx_generate_bundle,
+        .bundle_size = 0x3000,
+        .bundle_min_gpm_fifo_depth = 0xc2,
+        .bundle_token_limit = 0x200,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
index a0514d3de615..4186a0a2baa5 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
@@ -1021,25 +1021,33 @@ nvc0_grctx_mmio_item(struct nvc0_grctx *info, u32 addr, u32 data,
 }
 
 void
+nvc0_grctx_generate_bundle(struct nvc0_grctx *info)
+{
+        const struct nvc0_grctx_oclass *impl = nvc0_grctx_impl(info->priv);
+        const u32 access = NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS;
+        const int s = 8;
+        const int b = mmio_vram(info, impl->bundle_size, (1 << s), access);
+        mmio_refn(info, 0x408004, 0x00000000, s, b);
+        mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b);
+        mmio_refn(info, 0x418808, 0x00000000, s, b);
+        mmio_refn(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s), 0, b);
+}
+
+void
 nvc0_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 {
         int gpc, tpc;
         u32 offset;
 
-        mmio_data(0x002000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x008000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x060000, 0x1000, NV_MEM_ACCESS_RW);
 
-        mmio_list(0x408004, 0x00000000,  8, 0);
-        mmio_list(0x408008, 0x80000018,  0, 0);
         mmio_list(0x40800c, 0x00000000,  8, 1);
         mmio_list(0x408010, 0x80000000,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
         mmio_list(0x419004, 0x00000000,  8, 1);
         mmio_list(0x419008, 0x00000000,  0, 0);
-        mmio_list(0x418808, 0x00000000,  8, 0);
-        mmio_list(0x41880c, 0x80000018,  0, 0);
 
         mmio_list(0x405830, 0x02180000, 0, 0);
 
@@ -1218,6 +1226,7 @@ nvc0_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 
         nv_wr32(priv, 0x404154, 0x00000000);
 
+        oclass->bundle(info);
         oclass->mods(priv, info);
         oclass->unkn(priv);
 
@@ -1354,4 +1363,6 @@ nvc0_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .tpc   = nvc0_grctx_pack_tpc,
         .icmd  = nvc0_grctx_pack_icmd,
         .mthd  = nvc0_grctx_pack_mthd,
+        .bundle = nvc0_grctx_generate_bundle,
+        .bundle_size = 0x1800,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h
index 0579542cde3a..26744ac89fb7 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h
@@ -39,11 +39,23 @@ struct nvc0_grctx_oclass {
         /* indirect context data, generated with icmds/mthds */
         const struct nvc0_graph_pack *icmd;
         const struct nvc0_graph_pack *mthd;
+        /* bundle circular buffer */
+        void (*bundle)(struct nvc0_grctx *);
+        u32 bundle_size;
+        u32 bundle_min_gpm_fifo_depth;
+        u32 bundle_token_limit;
 };
 
+static inline const struct nvc0_grctx_oclass *
+nvc0_grctx_impl(struct nvc0_graph_priv *priv)
+{
+        return (void *)nv_engine(priv)->cclass;
+}
+
 extern struct nouveau_oclass *nvc0_grctx_oclass;
 int  nvc0_grctx_generate(struct nvc0_graph_priv *);
 void nvc0_grctx_generate_main(struct nvc0_graph_priv *, struct nvc0_grctx *);
+void nvc0_grctx_generate_bundle(struct nvc0_grctx *);
 void nvc0_grctx_generate_mods(struct nvc0_graph_priv *, struct nvc0_grctx *);
 void nvc0_grctx_generate_unkn(struct nvc0_graph_priv *);
 void nvc0_grctx_generate_tpcid(struct nvc0_graph_priv *);
@@ -64,6 +76,7 @@ extern struct nouveau_oclass *nvd9_grctx_oclass;
 extern struct nouveau_oclass *nve4_grctx_oclass;
 extern struct nouveau_oclass *gk20a_grctx_oclass;
 void nve4_grctx_generate_main(struct nvc0_graph_priv *, struct nvc0_grctx *);
+void nve4_grctx_generate_bundle(struct nvc0_grctx *);
 void nve4_grctx_generate_mods(struct nvc0_graph_priv *, struct nvc0_grctx *);
 void nve4_grctx_generate_unkn(struct nvc0_graph_priv *);
 void nve4_grctx_generate_r418bb8(struct nvc0_graph_priv *);
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c
index 24a92c569c0a..9043965c27a4 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c
@@ -732,19 +732,14 @@ nvc1_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         int gpc, tpc;
         u32 offset;
 
-        mmio_data(0x002000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x008000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x060000, 0x1000, NV_MEM_ACCESS_RW);
-        mmio_list(0x408004, 0x00000000,  8, 0);
-        mmio_list(0x408008, 0x80000018,  0, 0);
         mmio_list(0x40800c, 0x00000000,  8, 1);
         mmio_list(0x408010, 0x80000000,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
         mmio_list(0x419004, 0x00000000,  8, 1);
         mmio_list(0x419008, 0x00000000,  0, 0);
-        mmio_list(0x418808, 0x00000000,  8, 0);
-        mmio_list(0x41880c, 0x80000018,  0, 0);
 
         mmio_list(0x405830, 0x02180218, 0, 0);
         mmio_list(0x4064c4, 0x0086ffff, 0, 0);
@@ -794,4 +789,6 @@ nvc1_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .tpc   = nvc1_grctx_pack_tpc,
         .icmd  = nvc1_grctx_pack_icmd,
         .mthd  = nvc1_grctx_pack_mthd,
+        .bundle = nvc0_grctx_generate_bundle,
+        .bundle_size = 0x1800,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c
index e11ed5538193..e96606a57432 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c
@@ -100,4 +100,6 @@ nvc4_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .tpc   = nvc4_grctx_pack_tpc,
         .icmd  = nvc0_grctx_pack_icmd,
         .mthd  = nvc0_grctx_pack_mthd,
+        .bundle = nvc0_grctx_generate_bundle,
+        .bundle_size = 0x1800,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c
index feebd58dfe8d..cc4646e514fc 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c
@@ -351,4 +351,6 @@ nvc8_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .tpc   = nvc0_grctx_pack_tpc,
         .icmd  = nvc8_grctx_pack_icmd,
         .mthd  = nvc8_grctx_pack_mthd,
+        .bundle = nvc0_grctx_generate_bundle,
+        .bundle_size = 0x1800,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c
index 944d90bef959..930a205111b2 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c
@@ -184,17 +184,12 @@ nvd7_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         u32 offset;
         int gpc;
 
-        mmio_data(0x003000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x008000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x060000, 0x1000, NV_MEM_ACCESS_RW);
         mmio_list(0x40800c, 0x00000000,  8, 1);
         mmio_list(0x408010, 0x80000000,  0, 0);
         mmio_list(0x419004, 0x00000000,  8, 1);
         mmio_list(0x419008, 0x00000000,  0, 0);
-        mmio_list(0x408004, 0x00000000,  8, 0);
-        mmio_list(0x408008, 0x80000018,  0, 0);
-        mmio_list(0x418808, 0x00000000,  8, 0);
-        mmio_list(0x41880c, 0x80000018,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -233,6 +228,7 @@ nvd7_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 
         nv_wr32(priv, 0x404154, 0x00000000);
 
+        oclass->bundle(info);
         oclass->mods(priv, info);
         oclass->unkn(priv);
 
@@ -272,4 +268,6 @@ nvd7_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .ppc   = nvd7_grctx_pack_ppc,
         .icmd  = nvd9_grctx_pack_icmd,
         .mthd  = nvd9_grctx_pack_mthd,
+        .bundle = nvc0_grctx_generate_bundle,
+        .bundle_size = 0x1800,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c
index c665fb7e4660..8aa5e69aecc6 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c
@@ -519,4 +519,6 @@ nvd9_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .tpc   = nvd9_grctx_pack_tpc,
         .icmd  = nvd9_grctx_pack_icmd,
         .mthd  = nvd9_grctx_pack_mthd,
+        .bundle = nvc0_grctx_generate_bundle,
+        .bundle_size = 0x1800,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c
index cd036322d2d8..678708e15718 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c
@@ -839,13 +839,29 @@ nve4_grctx_pack_ppc[] = {
  ******************************************************************************/
 
 void
+nve4_grctx_generate_bundle(struct nvc0_grctx *info)
+{
+        const struct nvc0_grctx_oclass *impl = nvc0_grctx_impl(info->priv);
+        const u32 state_limit = min(impl->bundle_min_gpm_fifo_depth,
+                                    impl->bundle_size / 0x20);
+        const u32 token_limit = impl->bundle_token_limit;
+        const u32 access = NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS;
+        const int s = 8;
+        const int b = mmio_vram(info, impl->bundle_size, (1 << s), access);
+        mmio_refn(info, 0x408004, 0x00000000, s, b);
+        mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b);
+        mmio_refn(info, 0x418808, 0x00000000, s, b);
+        mmio_refn(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s), 0, b);
+        mmio_wr32(info, 0x4064c8, (state_limit << 16) | token_limit);
+}
+
+void
 nve4_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 {
         u32 magic[GPC_MAX][2];
         u32 offset;
         int gpc;
 
-        mmio_data(0x003000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x008000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x060000, 0x1000, NV_MEM_ACCESS_RW);
         mmio_list(0x40800c, 0x00000000,  8, 1);
@@ -853,11 +869,6 @@ nve4_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         mmio_list(0x419004, 0x00000000,  8, 1);
         mmio_list(0x419008, 0x00000000,  0, 0);
         mmio_list(0x4064cc, 0x80000000,  0, 0);
-        mmio_list(0x408004, 0x00000000,  8, 0);
-        mmio_list(0x408008, 0x80000030,  0, 0);
-        mmio_list(0x418808, 0x00000000,  8, 0);
-        mmio_list(0x41880c, 0x80000030,  0, 0);
-        mmio_list(0x4064c8, 0x01800600,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -967,6 +978,7 @@ nve4_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 
         nv_wr32(priv, 0x404154, 0x00000000);
 
+        oclass->bundle(info);
         oclass->mods(priv, info);
         oclass->unkn(priv);
 
@@ -1018,4 +1030,8 @@ nve4_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .ppc   = nve4_grctx_pack_ppc,
         .icmd  = nve4_grctx_pack_icmd,
         .mthd  = nve4_grctx_pack_mthd,
+        .bundle = nve4_grctx_generate_bundle,
+        .bundle_size = 0x3000,
+        .bundle_min_gpm_fifo_depth = 0x180,
+        .bundle_token_limit = 0x600,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c
index 3e6ac2703d72..89a77a2788ba 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c
@@ -816,7 +816,6 @@ nvf0_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         u32 offset;
         int gpc;
 
-        mmio_data(0x003000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x008000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x060000, 0x1000, NV_MEM_ACCESS_RW);
         mmio_list(0x40800c, 0x00000000,  8, 1);
@@ -824,11 +823,6 @@ nvf0_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         mmio_list(0x419004, 0x00000000,  8, 1);
         mmio_list(0x419008, 0x00000000,  0, 0);
         mmio_list(0x4064cc, 0x80000000,  0, 0);
-        mmio_list(0x408004, 0x00000000,  8, 0);
-        mmio_list(0x408008, 0x80000030,  0, 0);
-        mmio_list(0x418808, 0x00000000,  8, 0);
-        mmio_list(0x41880c, 0x80000030,  0, 0);
-        mmio_list(0x4064c8, 0x01800600,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -882,4 +876,8 @@ nvf0_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .ppc   = nvf0_grctx_pack_ppc,
         .icmd  = nvf0_grctx_pack_icmd,
         .mthd  = nvf0_grctx_pack_mthd,
+        .bundle = nve4_grctx_generate_bundle,
+        .bundle_size = 0x3000,
+        .bundle_min_gpm_fifo_depth = 0x180,
+        .bundle_token_limit = 0x7c0,
 }.base;