13 files changed, 75 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 b3f5ea66566e..11bf8b3a45df 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk110b.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk110b.c
@@ -95,4 +95,6 @@ gk110b_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .bundle_size = 0x3000,
         .bundle_min_gpm_fifo_depth = 0x180,
         .bundle_token_limit = 0x600,
+        .pagepool = nve4_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c
index 1ec78bdca4b1..c560f486dcfb 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c
@@ -54,4 +54,6 @@ gk20a_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .bundle_size = 0x1800,
         .bundle_min_gpm_fifo_depth = 0x62,
         .bundle_token_limit = 0x100,
+        .pagepool = nve4_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c
index a4f008855966..5f4d60e0ea07 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c
@@ -876,18 +876,25 @@ gm107_grctx_generate_bundle(struct nvc0_grctx *info)
 }
 
 static void
+gm107_grctx_generate_pagepool(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->pagepool_size, (1 << s), access);
+        mmio_refn(info, 0x40800c, 0x00000000, s, b);
+        mmio_wr32(info, 0x408010, 0x80000000);
+        mmio_refn(info, 0x419004, 0x00000000, s, b);
+        mmio_wr32(info, 0x419008, 0x00000000);
+        mmio_wr32(info, 0x4064cc, 0x80000000);
+        mmio_wr32(info, 0x418e30, 0x80000000); /* guess at it being related */
+}
+
+static void
 gm107_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 {
-        mmio_data(0x008000, 0x0100, NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS);
         mmio_data(0x200000, 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(0x4064cc, 0x80000000,  0, 0);
-        mmio_list(0x418e30, 0x80000000,  0, 0);
-
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
         mmio_list(0x419c2c, 0x10000000, 12, 2);
@@ -944,6 +951,7 @@ gm107_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         nv_wr32(priv, 0x404154, 0x00000000);
 
         oclass->bundle(info);
+        oclass->pagepool(info);
         oclass->mods(priv, info);
         oclass->unkn(priv);
 
@@ -1002,4 +1010,6 @@ gm107_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .bundle_size = 0x3000,
         .bundle_min_gpm_fifo_depth = 0x180,
         .bundle_token_limit = 0x2c0,
+        .pagepool = gm107_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
index c9eb8ed46d12..c3487c42e5d6 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
@@ -538,13 +538,7 @@ nv108_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         u32 offset;
         int gpc;
 
-        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(0x4064cc, 0x80000000,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -594,4 +588,6 @@ nv108_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .bundle_size = 0x3000,
         .bundle_min_gpm_fifo_depth = 0xc2,
         .bundle_token_limit = 0x200,
+        .pagepool = nve4_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
index 4186a0a2baa5..8dd3a5b56cd3 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
@@ -1034,20 +1034,28 @@ nvc0_grctx_generate_bundle(struct nvc0_grctx *info)
 }
 
 void
+nvc0_grctx_generate_pagepool(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->pagepool_size, (1 << s), access);
+        mmio_refn(info, 0x40800c, 0x00000000, s, b);
+        mmio_wr32(info, 0x408010, 0x80000000);
+        mmio_refn(info, 0x419004, 0x00000000, s, b);
+        mmio_wr32(info, 0x419008, 0x00000000);
+}
+
+void
 nvc0_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 {
         int gpc, tpc;
         u32 offset;
 
-        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(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
-        mmio_list(0x419004, 0x00000000,  8, 1);
-        mmio_list(0x419008, 0x00000000,  0, 0);
 
         mmio_list(0x405830, 0x02180000, 0, 0);
 
@@ -1227,6 +1235,7 @@ nvc0_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         nv_wr32(priv, 0x404154, 0x00000000);
 
         oclass->bundle(info);
+        oclass->pagepool(info);
         oclass->mods(priv, info);
         oclass->unkn(priv);
 
@@ -1365,4 +1374,6 @@ nvc0_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .mthd  = nvc0_grctx_pack_mthd,
         .bundle = nvc0_grctx_generate_bundle,
         .bundle_size = 0x1800,
+        .pagepool = nvc0_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h
index 26744ac89fb7..6387a160ac18 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h
@@ -44,6 +44,9 @@ struct nvc0_grctx_oclass {
         u32 bundle_size;
         u32 bundle_min_gpm_fifo_depth;
         u32 bundle_token_limit;
+        /* pagepool */
+        void (*pagepool)(struct nvc0_grctx *);
+        u32 pagepool_size;
 };
 
 static inline const struct nvc0_grctx_oclass *
@@ -56,6 +59,7 @@ 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_pagepool(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 *);
@@ -77,6 +81,7 @@ 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_pagepool(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 9043965c27a4..f174204c18ab 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c
@@ -732,14 +732,9 @@ nvc1_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         int gpc, tpc;
         u32 offset;
 
-        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(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
-        mmio_list(0x419004, 0x00000000,  8, 1);
-        mmio_list(0x419008, 0x00000000,  0, 0);
 
         mmio_list(0x405830, 0x02180218, 0, 0);
         mmio_list(0x4064c4, 0x0086ffff, 0, 0);
@@ -791,4 +786,6 @@ nvc1_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .mthd  = nvc1_grctx_pack_mthd,
         .bundle = nvc0_grctx_generate_bundle,
         .bundle_size = 0x1800,
+        .pagepool = nvc0_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c
index e96606a57432..ec7f32a6a0f9 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c
@@ -102,4 +102,6 @@ nvc4_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .mthd  = nvc0_grctx_pack_mthd,
         .bundle = nvc0_grctx_generate_bundle,
         .bundle_size = 0x1800,
+        .pagepool = nvc0_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c
index cc4646e514fc..de0586829ce1 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c
@@ -353,4 +353,6 @@ nvc8_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .mthd  = nvc8_grctx_pack_mthd,
         .bundle = nvc0_grctx_generate_bundle,
         .bundle_size = 0x1800,
+        .pagepool = nvc0_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c
index 930a205111b2..ce016ac225a9 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c
@@ -184,12 +184,7 @@ nvd7_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         u32 offset;
         int gpc;
 
-        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(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -229,6 +224,7 @@ nvd7_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         nv_wr32(priv, 0x404154, 0x00000000);
 
         oclass->bundle(info);
+        oclass->pagepool(info);
         oclass->mods(priv, info);
         oclass->unkn(priv);
 
@@ -270,4 +266,6 @@ nvd7_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .mthd  = nvd9_grctx_pack_mthd,
         .bundle = nvc0_grctx_generate_bundle,
         .bundle_size = 0x1800,
+        .pagepool = nvc0_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c
index 8aa5e69aecc6..b2b0f7085ea7 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c
@@ -521,4 +521,6 @@ nvd9_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .mthd  = nvd9_grctx_pack_mthd,
         .bundle = nvc0_grctx_generate_bundle,
         .bundle_size = 0x1800,
+        .pagepool = nvc0_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c
index 678708e15718..9dfb60d8e5a8 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c
@@ -856,19 +856,27 @@ nve4_grctx_generate_bundle(struct nvc0_grctx *info)
 }
 
 void
+nve4_grctx_generate_pagepool(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->pagepool_size, (1 << s), access);
+        mmio_refn(info, 0x40800c, 0x00000000, s, b);
+        mmio_wr32(info, 0x408010, 0x80000000);
+        mmio_refn(info, 0x419004, 0x00000000, s, b);
+        mmio_wr32(info, 0x419008, 0x00000000);
+        mmio_wr32(info, 0x4064cc, 0x80000000);
+}
+
+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(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(0x4064cc, 0x80000000,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -979,6 +987,7 @@ nve4_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         nv_wr32(priv, 0x404154, 0x00000000);
 
         oclass->bundle(info);
+        oclass->pagepool(info);
         oclass->mods(priv, info);
         oclass->unkn(priv);
 
@@ -1034,4 +1043,6 @@ nve4_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .bundle_size = 0x3000,
         .bundle_min_gpm_fifo_depth = 0x180,
         .bundle_token_limit = 0x600,
+        .pagepool = nve4_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c
index 89a77a2788ba..e25ec47defa8 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c
@@ -816,13 +816,7 @@ nvf0_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
         u32 offset;
         int gpc;
 
-        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(0x4064cc, 0x80000000,  0, 0);
         mmio_list(0x418810, 0x80000000, 12, 2);
         mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -880,4 +874,6 @@ nvf0_grctx_oclass = &(struct nvc0_grctx_oclass) {
         .bundle_size = 0x3000,
         .bundle_min_gpm_fifo_depth = 0x180,
         .bundle_token_limit = 0x7c0,
+        .pagepool = nve4_grctx_generate_pagepool,
+        .pagepool_size = 0x8000,
 }.base;