drm/gf100-/gr: unhardcode bundle cb config

[deliverable/linux.git] / drivers / gpu / drm / nouveau / core / engine / graph / ctxnv108.c

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
index 48351b4d6d6bd8460ee83b2110f9e1adce7235bf..c9eb8ed46d127608837c30b6fffa14474d042693 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c
@@ -538,17 +538,13 @@ 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);
        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, 0x80000030,  0, 0);
-       mmio_list(0x418808, 0x00000000,  8, 0);
-       mmio_list(0x41880c, 0x80000030,  0, 0);
+       mmio_list(0x4064cc, 0x80000000,  0, 0);
        mmio_list(0x418810, 0x80000000, 12, 2);
        mmio_list(0x419848, 0x10000000, 12, 2);
 
@@ -594,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;