drm/nouveau/gr/gf100-: move reset during golden ctx init to fecs_reset()

Ampere.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@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 edd4b867a1e22c7458a88b037b2e21b4baff7548..a56f4f3f6c1e9670deca7dcadeef5941182edbae 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1438,11 +1438,7 @@ gf100_grctx_generate(struct gf100_gr *gr, struct gf100_gr_chan *chan, struct nvk
                grctx->unkn88c(gr, true);
 
        /* Reset FECS. */
-       nvkm_wr32(device, 0x409614, 0x00000070);
-       nvkm_usec(device, 10, NVKM_DELAY);
-       nvkm_mask(device, 0x409614, 0x00000700, 0x00000700);
-       nvkm_usec(device, 10, NVKM_DELAY);
-       nvkm_rd32(device, 0x409614);
+       gr->func->fecs.reset(gr);
 
        if (grctx->unkn88c)
                grctx->unkn88c(gr, false);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 17e1c0dfda478cef1fa5e9defd2b6603851ef3cb..8f935b9064b38dad60314399c0c8bcf585271958 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -2400,6 +2400,18 @@ gf100_gr_init(struct gf100_gr *gr)
        return gf100_gr_init_ctxctl(gr);
 }
 
+void
+gf100_gr_fecs_reset(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+
+       nvkm_wr32(device, 0x409614, 0x00000070);
+       nvkm_usec(device, 10, NVKM_DELAY);
+       nvkm_mask(device, 0x409614, 0x00000700, 0x00000700);
+       nvkm_usec(device, 10, NVKM_DELAY);
+       nvkm_rd32(device, 0x409614);
+}
+
 #include "fuc/hubgf100.fuc3.h"
 
 struct gf100_gr_ucode
@@ -2456,6 +2468,7 @@ gf100_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gf100_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .grctx = &gf100_grctx,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
index 66aefc972a183441e4e788c5cbe2923f28fd358b..f98c739fb0b96d0c19632cd27f56249395c9971e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
@@ -172,6 +172,7 @@ struct gf100_gr_func {
        const struct gf100_gr_pack *mmio;
        struct {
                struct gf100_gr_ucode *ucode;
+               void (*reset)(struct gf100_gr *);
        } fecs;
        struct {
                struct gf100_gr_ucode *ucode;
@@ -202,6 +203,7 @@ void gf100_gr_init_shader_exceptions(struct gf100_gr *, int, int);
 void gf100_gr_init_400054(struct gf100_gr *);
 void gf100_gr_init_num_tpc_per_gpc(struct gf100_gr *, bool, bool);
 extern const struct gf100_gr_func_zbc gf100_gr_zbc;
+void gf100_gr_fecs_reset(struct gf100_gr *);
 
 void gf117_gr_init_zcull(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 3acd99c306f201f80f97e854b166cf455c6758a6..bb82c0a25ef87a1ef307bd63ec1e1246a2c7b982 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
@@ -131,6 +131,7 @@ gf104_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gf104_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .grctx = &gf104_grctx,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
index ab3760e804b8a64c2ba784179ec8a92e7a5645c3..e62520653e40f28a4172a187d9356d4a76bbd6e5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
@@ -129,6 +129,7 @@ gf108_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gf108_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .grctx = &gf108_grctx,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
index 616e2def1865f8ceae3819b00936c0852c42f18e..d489602be1d34e5e1eaadce597d50d8c07979388 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
@@ -103,6 +103,7 @@ gf110_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gf110_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .grctx = &gf110_grctx,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
index 669e7536970e6142f015ec0a3d436316efc573fc..e3e69ab34fa3c0ec668985e285d08e4850cf6993 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
@@ -167,6 +167,7 @@ gf117_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gf117_gr_pack_mmio,
        .fecs.ucode = &gf117_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gf117_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .ppc_nr = 1,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
index 5b09bda8110c3539f1f8ed32f58337c2f4201309..4dccf0bf25b7c891a5a4ae94961fea301253cd89 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
@@ -194,6 +194,7 @@ gf119_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gf119_gr_pack_mmio,
        .fecs.ucode = &gf100_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gf100_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .grctx = &gf119_grctx,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
index b680eaa0f3502e2936080583edca7a3585b8ecd8..cff24a01ddc0167572a87c0c74477c5db5716a1f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
@@ -474,6 +474,7 @@ gk104_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gk104_gr_pack_mmio,
        .fecs.ucode = &gk104_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gk104_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .ppc_nr = 1,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
index 103e06a77e658ca9f108c3fc0259043715a05138..ae430b351d4f719369059a7bb148268f951c8288 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
@@ -370,6 +370,7 @@ gk110_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gk110_gr_pack_mmio,
        .fecs.ucode = &gk110_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gk110_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .ppc_nr = 2,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
index 034d0b11a17d451f88b04093d9680037cada8c77..c22eadaee1619cd82a63c4dce1db8b733fed425b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
@@ -122,6 +122,7 @@ gk110b_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gk110b_gr_pack_mmio,
        .fecs.ucode = &gk110_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gk110_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .ppc_nr = 2,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
index 116d682f9f962523dfeb3fa1655de26115c6e7f1..35a70a48ed7918f039701d30245af1f440a2ecaa 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
@@ -180,6 +180,7 @@ gk208_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gk208_gr_pack_mmio,
        .fecs.ucode = &gk208_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gk208_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .ppc_nr = 1,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
index be0b2cefd8e8aad984946be55d8759cf0c364287..d5c59ff33d2256b9049a59e3a281031f2f6b07b4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
@@ -294,6 +294,7 @@ gk20a_gr = {
        .init_rop_active_fbps = gk104_gr_init_rop_active_fbps,
        .trap_mp = gf100_gr_trap_mp,
        .set_hww_esr_report_mask = gk20a_gr_set_hww_esr_report_mask,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gf100_gr_rops,
        .ppc_nr = 1,
        .grctx = &gk20a_grctx,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
index 310987174cb566bdd27d50029c1a594e02834c8b..17c36f30c86c4c3d8330ce9e5f43a806f2efb1c5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
@@ -415,6 +415,7 @@ gm107_gr = {
        .trap_mp = gf100_gr_trap_mp,
        .mmio = gm107_gr_pack_mmio,
        .fecs.ucode = &gm107_gr_fecs_ucode,
+       .fecs.reset = gf100_gr_fecs_reset,
        .gpccs.ucode = &gm107_gr_gpccs_ucode,
        .rops = gf100_gr_rops,
        .ppc_nr = 2,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c
index 385cfd91b2669d5b4792fa75b083c546f0bfc8bb..31e753f0aaf4ef145899a348895c83b1f8b522e8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c
@@ -201,6 +201,7 @@ gm200_gr = {
        .init_shader_exceptions = gm107_gr_init_shader_exceptions,
        .init_400054 = gm107_gr_init_400054,
        .trap_mp = gf100_gr_trap_mp,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .tpc_nr = 4,
        .ppc_nr = 2,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c
index ec1c46e47e00618f6e15f64b82481587b5caec48..458cd1a00d3f853b864fc7747a61835e07c2fd56 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c
@@ -123,6 +123,7 @@ gm20b_gr = {
        .init_rop_active_fbps = gk104_gr_init_rop_active_fbps,
        .trap_mp = gf100_gr_trap_mp,
        .set_hww_esr_report_mask = gm20b_gr_set_hww_esr_report_mask,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .ppc_nr = 1,
        .grctx = &gm20b_grctx,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c
index 0550dd6f46f130a8d545cfd99fd26e86b2dd6709..7a6657bcc7c35fcd691a8e8c2a6b1f9133111d5c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c
@@ -120,6 +120,7 @@ gp100_gr = {
        .init_504430 = gm107_gr_init_504430,
        .init_shader_exceptions = gp100_gr_init_shader_exceptions,
        .trap_mp = gf100_gr_trap_mp,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .gpc_nr = 6,
        .tpc_nr = 5,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
index 1d1f3c0a901458a13ee8a7e4a9307dc5e689ab4f..ebde815ac9d9e1b105a29502b595bdaa4029c396 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
@@ -116,6 +116,7 @@ gp102_gr = {
        .init_504430 = gm107_gr_init_504430,
        .init_shader_exceptions = gp100_gr_init_shader_exceptions,
        .trap_mp = gf100_gr_trap_mp,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .gpc_nr = 6,
        .tpc_nr = 5,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c
index 2655574ec63b089faa27236127870e7e2d678e52..3d824bd7180c4855c5dfc1d6ae24f6fa18d280d1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c
@@ -44,6 +44,7 @@ gp104_gr = {
        .init_504430 = gm107_gr_init_504430,
        .init_shader_exceptions = gp100_gr_init_shader_exceptions,
        .trap_mp = gf100_gr_trap_mp,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .gpc_nr = 6,
        .tpc_nr = 5,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
index adabc04d4f3a96fdb27681c5f2ae2982503b8cc1..d4f87d92378718475db817d0a2468d6d9058fbaa 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
@@ -46,6 +46,7 @@ gp107_gr = {
        .init_504430 = gm107_gr_init_504430,
        .init_shader_exceptions = gp100_gr_init_shader_exceptions,
        .trap_mp = gf100_gr_trap_mp,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .gpc_nr = 2,
        .tpc_nr = 3,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c
index e13683b6e7b104022b8db3b6970be24aaf706509..a20db4d93b28f8475e3c70fe5ec0a2e7c55b74fa 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c
@@ -56,6 +56,7 @@ gp10b_gr = {
        .init_504430 = gm107_gr_init_504430,
        .init_shader_exceptions = gp100_gr_init_shader_exceptions,
        .trap_mp = gf100_gr_trap_mp,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .gpc_nr = 1,
        .tpc_nr = 2,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c
index 4d043c1173eafa53f871ffee81d1f37885c161e1..c57bb3970eb6d32637414c0edf4198efe032fbac 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c
@@ -105,6 +105,7 @@ gv100_gr = {
        .init_shader_exceptions = gv100_gr_init_shader_exceptions,
        .init_4188a4 = gv100_gr_init_4188a4,
        .trap_mp = gv100_gr_trap_mp,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .gpc_nr = 6,
        .tpc_nr = 5,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c
index 1a8a21844e12e0d3288133f534220e7ca4378c63..88f768ca8e47e56280d3f67f9fa516793e9ee763 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c
@@ -110,6 +110,7 @@ tu102_gr = {
        .init_504430 = gv100_gr_init_504430,
        .init_shader_exceptions = gv100_gr_init_shader_exceptions,
        .trap_mp = gv100_gr_trap_mp,
+       .fecs.reset = gf100_gr_fecs_reset,
        .rops = gm200_gr_rops,
        .gpc_nr = 6,
        .tpc_nr = 5,