drm/nouveau/gr/gf100-: virtualise init_vsc_stream_master

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 6ecb4a05096d5724231b76731ae9a6780d2130c3..0c92b8c6375a326c013360227c5e8d5d6b03feaf 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1930,6 +1930,13 @@ gf100_gr_init_gpc_mmu(struct gf100_gr *gr)
        nvkm_wr32(device, 0x4188b8, nvkm_memory_addr(fb->mmu_rd) >> 8);
 }
 
+void
+gf100_gr_init_vsc_stream_master(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);
+}
+
 int
 gf100_gr_init(struct gf100_gr *gr)
 {
@@ -1956,7 +1963,7 @@ gf100_gr_init(struct gf100_gr *gr)
        if (gr->func->init_bios)
                gr->func->init_bios(gr);
 
-       nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);
+       gr->func->init_vsc_stream_master(gr);
 
        memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
        for (i = 0, gpc = -1; i < gr->tpc_total; i++) {
@@ -2068,6 +2075,7 @@ static const struct gf100_gr_func
 gf100_gr = {
        .init = gf100_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gf100_gr_init_vsc_stream_master,
        .mmio = gf100_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
index 1320befd4f10c0167783c821fd9c379ba5f563f2..45792a33fd6578c3169fcdd6232f94ebaf1d3a24 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
@@ -124,6 +124,7 @@ struct gf100_gr_func {
        void (*init_gpc_mmu)(struct gf100_gr *);
        void (*init_r405a14)(struct gf100_gr *);
        void (*init_bios)(struct gf100_gr *);
+       void (*init_vsc_stream_master)(struct gf100_gr *);
        void (*init_rop_active_fbps)(struct gf100_gr *);
        void (*init_ppc_exceptions)(struct gf100_gr *);
        void (*init_swdx_pes_mask)(struct gf100_gr *);
@@ -143,10 +144,12 @@ struct gf100_gr_func {
        struct nvkm_sclass sclass[];
 };
 
-int gf100_gr_init(struct gf100_gr *);
 int gf100_gr_rops(struct gf100_gr *);
+int gf100_gr_init(struct gf100_gr *);
+void gf100_gr_init_vsc_stream_master(struct gf100_gr *);
 
 int gk104_gr_init(struct gf100_gr *);
+void gk104_gr_init_vsc_stream_master(struct gf100_gr *);
 void gk104_gr_init_rop_active_fbps(struct gf100_gr *);
 void gk104_gr_init_ppc_exceptions(struct gf100_gr *);
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
index ec0f11983b23316de2b1888151c6b268f3af5c07..61b27b179e15d2b4efa96ffcfb0aa695b7f9d160 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
@@ -116,6 +116,7 @@ static const struct gf100_gr_func
 gf104_gr = {
        .init = gf100_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gf100_gr_init_vsc_stream_master,
        .mmio = gf104_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
index 3a59dea5ad7a2de8919dbca354c8d7db52b873e5..992727f79439f720424141e247782c73cf0e03be 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
@@ -114,6 +114,7 @@ gf108_gr = {
        .init = gf100_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
        .init_r405a14 = gf108_gr_init_r405a14,
+       .init_vsc_stream_master = gf100_gr_init_vsc_stream_master,
        .mmio = gf108_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
index 10d2d73ca8c3a2a4978bbbd04f2f5eac38d483ca..07a57cc5074fb583cbca6593c1642393c029e683 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
@@ -88,6 +88,7 @@ static const struct gf100_gr_func
 gf110_gr = {
        .init = gf100_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gf100_gr_init_vsc_stream_master,
        .mmio = gf110_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
index ac09a07c4150bf4d566cacb7f6e2b8928ac7357b..29ab01be71ec0529a0ae60abc5acea529e8954bc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
@@ -124,6 +124,7 @@ static const struct gf100_gr_func
 gf117_gr = {
        .init = gf100_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gf100_gr_init_vsc_stream_master,
        .mmio = gf117_gr_pack_mmio,
        .fecs.ucode = &gf117_gr_fecs_ucode,
        .gpccs.ucode = &gf117_gr_gpccs_ucode,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
index 7f449ec6f7603c768c16a7bc97dfe7182a308155..d3b06dd7702d82c3ea1a2d40421620ee734fdc1e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
@@ -179,6 +179,7 @@ static const struct gf100_gr_func
 gf119_gr = {
        .init = gf100_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gf100_gr_init_vsc_stream_master,
        .mmio = gf119_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
index 1b52fcb2c49a209a00f1f8df64c66b49492791b0..835f498d6b98aa3559b5251f3ca7d2f86185ae73 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
@@ -404,6 +404,13 @@ gk104_gr_init_ppc_exceptions(struct gf100_gr *gr)
        }
 }
 
+void
+gk104_gr_init_vsc_stream_master(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       nvkm_wr32(device, GPC_UNIT(0, 0x3018), 0x00000001);
+}
+
 int
 gk104_gr_init(struct gf100_gr *gr)
 {
@@ -421,7 +428,7 @@ gk104_gr_init(struct gf100_gr *gr)
                nvkm_therm_clkgate_init(gr->base.engine.subdev.device->therm,
                                        gr->func->clkgate_pack);
 
-       nvkm_wr32(device, GPC_UNIT(0, 0x3018), 0x00000001);
+       gr->func->init_vsc_stream_master(gr);
 
        memset(data, 0x00, sizeof(data));
        memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
@@ -536,6 +543,7 @@ static const struct gf100_gr_func
 gk104_gr = {
        .init = gk104_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gk104_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .mmio = gk104_gr_pack_mmio,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
index 4da916a9fc73d382d656526f40cc1ffda05716b4..eef7476e0ee89d4ade5083484dfe4c4289e13b48 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
@@ -338,6 +338,7 @@ static const struct gf100_gr_func
 gk110_gr = {
        .init = gk104_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gk104_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .mmio = gk110_gr_pack_mmio,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
index 1912c0bfd7eedf6039fac743775bb067e80ed3e1..ed4361a830a5e089f48b52dd48f5e47be4d5f17e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
@@ -104,6 +104,7 @@ static const struct gf100_gr_func
 gk110b_gr = {
        .init = gk104_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gk104_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .mmio = gk110b_gr_pack_mmio,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
index 1fc258163f25a0ef1386b1417ea807a3505b36f6..4c8beb9c1708532259e1eb7d93c2aaee30580bc6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
@@ -163,6 +163,7 @@ static const struct gf100_gr_func
 gk208_gr = {
        .init = gk104_gr_init,
        .init_gpc_mmu = gf100_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gk104_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .mmio = gk208_gr_pack_mmio,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
index d5629cdddf4a696157488014ba6621928ee5d923..58c03d6c1c2dc2f836df6560e0259e0eb08186df 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
@@ -337,7 +337,7 @@ gm107_gr_init(struct gf100_gr *gr)
 
        gr->func->init_bios(gr);
 
-       nvkm_wr32(device, GPC_UNIT(0, 0x3018), 0x00000001);
+       gr->func->init_vsc_stream_master(gr);
 
        memset(data, 0x00, sizeof(data));
        memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
@@ -452,6 +452,7 @@ gm107_gr = {
        .init = gm107_gr_init,
        .init_gpc_mmu = gm107_gr_init_gpc_mmu,
        .init_bios = gm107_gr_init_bios,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gk104_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .mmio = gm107_gr_pack_mmio,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c
index 7a793a0bb28ed94ed4457e373de8e2087d3771c5..8583aad367afc9a5816b0709aa3f2e3f1b2de6f6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c
@@ -77,7 +77,7 @@ gm200_gr_init(struct gf100_gr *gr)
 
        gr->func->init_bios(gr);
 
-       nvkm_wr32(device, GPC_UNIT(0, 0x3018), 0x00000001);
+       gr->func->init_vsc_stream_master(gr);
 
        memset(data, 0x00, sizeof(data));
        memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
@@ -211,6 +211,7 @@ gm200_gr = {
        .init = gm200_gr_init,
        .init_gpc_mmu = gm200_gr_init_gpc_mmu,
        .init_bios = gm107_gr_init_bios,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gm200_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .rops = gm200_gr_rops,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c
index 867a5f7cc5bce3ee447ac8bc78f5b051d7626748..edaaebbe76131aa190605e8d7b31affeada7a89b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c
@@ -63,7 +63,7 @@ gp100_gr_init(struct gf100_gr *gr)
 
        gf100_gr_mmio(gr, gr->fuc_sw_nonctx);
 
-       nvkm_wr32(device, GPC_UNIT(0, 0x3018), 0x00000001);
+       gr->func->init_vsc_stream_master(gr);
 
        memset(data, 0x00, sizeof(data));
        memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
@@ -160,6 +160,7 @@ static const struct gf100_gr_func
 gp100_gr = {
        .init = gp100_gr_init,
        .init_gpc_mmu = gm200_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gp100_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .init_num_active_ltcs = gp100_gr_init_num_active_ltcs,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
index 61e3a0b0855950bf6f2970b9828f079b21693d14..821a6c4589e234112359b6b563e4da4f82f0f956 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
@@ -44,6 +44,7 @@ static const struct gf100_gr_func
 gp102_gr = {
        .init = gp100_gr_init,
        .init_gpc_mmu = gm200_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gp100_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .init_swdx_pes_mask = gp102_gr_init_swdx_pes_mask,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
index f7272323f694ae41930ea28842995d25bf5bff50..e2e12975bb2cb07720e849c55bec6395ccc11b6a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
@@ -30,6 +30,7 @@ static const struct gf100_gr_func
 gp107_gr = {
        .init = gp100_gr_init,
        .init_gpc_mmu = gm200_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gp100_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .init_swdx_pes_mask = gp102_gr_init_swdx_pes_mask,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c
index 5f3d161a0842d4fd292d9b780fef9c11a7b74b43..e90cc3c845ec460b64e1fa3ba26e1fe721261713 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c
@@ -37,6 +37,7 @@ static const struct gf100_gr_func
 gp10b_gr = {
        .init = gp100_gr_init,
        .init_gpc_mmu = gm200_gr_init_gpc_mmu,
+       .init_vsc_stream_master = gk104_gr_init_vsc_stream_master,
        .init_rop_active_fbps = gp100_gr_init_rop_active_fbps,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .init_num_active_ltcs = gp10b_gr_init_num_active_ltcs,