drm/nouveau/gr/gf100-: virtualise init_419eb4 + apply fixes from traces

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 ad18ef9..9472782 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1915,6 +1915,13 @@ gf100_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device,
 }
 
 void
+gf100_gr_init_419eb4(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       nvkm_mask(device, 0x419eb4, 0x00001000, 0x00001000);
+}
+
+void
 gf100_gr_init_419cc0(struct gf100_gr *gr)
 {
        struct nvkm_device *device = gr->base.engine.subdev.device;
@@ -2059,8 +2066,8 @@ gf100_gr_init(struct gf100_gr *gr)
 
        if (gr->func->init_419cc0)
                gr->func->init_419cc0(gr);
-
-       nvkm_mask(device, 0x419eb4, 0x00001000, 0x00001000);
+       if (gr->func->init_419eb4)
+               gr->func->init_419eb4(gr);
 
        for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
                nvkm_wr32(device, GPC_UNIT(gpc, 0x0420), 0xc0000000);
@@ -2130,6 +2137,7 @@ gf100_gr = {
        .init_fecs_exceptions = gf100_gr_init_fecs_exceptions,
        .init_40601c = gf100_gr_init_40601c,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gf100_gr_init_419eb4,
        .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 cab0948..1dae373 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
@@ -135,6 +135,7 @@ struct gf100_gr_func {
        void (*init_40601c)(struct gf100_gr *);
        void (*init_sked_hww_esr)(struct gf100_gr *);
        void (*init_419cc0)(struct gf100_gr *);
+       void (*init_419eb4)(struct gf100_gr *);
        void (*init_ppc_exceptions)(struct gf100_gr *);
        void (*set_hww_esr_report_mask)(struct gf100_gr *);
        const struct gf100_gr_pack *mmio;
@@ -159,6 +160,7 @@ void gf100_gr_init_num_active_ltcs(struct gf100_gr *);
 void gf100_gr_init_fecs_exceptions(struct gf100_gr *);
 void gf100_gr_init_40601c(struct gf100_gr *);
 void gf100_gr_init_419cc0(struct gf100_gr *);
+void gf100_gr_init_419eb4(struct gf100_gr *);
 
 void gf117_gr_init_zcull(struct gf100_gr *);
 
@@ -168,6 +170,8 @@ void gk104_gr_init_rop_active_fbps(struct gf100_gr *);
 void gk104_gr_init_ppc_exceptions(struct gf100_gr *);
 void gk104_gr_init_sked_hww_esr(struct gf100_gr *);
 
+void gk110_gr_init_419eb4(struct gf100_gr *);
+
 int gk20a_gr_init(struct gf100_gr *);
 
 int gm200_gr_rops(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 8598e15..59d4dac 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
@@ -122,6 +122,7 @@ gf104_gr = {
        .init_fecs_exceptions = gf100_gr_init_fecs_exceptions,
        .init_40601c = gf100_gr_init_40601c,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gf100_gr_init_419eb4,
        .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 83c71ff..73cb23a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
@@ -120,6 +120,7 @@ gf108_gr = {
        .init_fecs_exceptions = gf100_gr_init_fecs_exceptions,
        .init_40601c = gf100_gr_init_40601c,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gf100_gr_init_419eb4,
        .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 b2b4489..1d7188e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
@@ -94,6 +94,7 @@ gf110_gr = {
        .init_fecs_exceptions = gf100_gr_init_fecs_exceptions,
        .init_40601c = gf100_gr_init_40601c,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gf100_gr_init_419eb4,
        .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 ec91a59..3465567 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
@@ -158,6 +158,7 @@ gf117_gr = {
        .init_fecs_exceptions = gf100_gr_init_fecs_exceptions,
        .init_40601c = gf100_gr_init_40601c,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gf100_gr_init_419eb4,
        .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 570527f..28c00cb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
@@ -185,6 +185,7 @@ gf119_gr = {
        .init_fecs_exceptions = gf100_gr_init_fecs_exceptions,
        .init_40601c = gf100_gr_init_40601c,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gf100_gr_init_419eb4,
        .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 dcd59af..775b474 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
@@ -461,7 +461,7 @@ gk104_gr_init(struct gf100_gr *gr)
        nvkm_wr32(device, 0x405840, 0xc0000000);
        nvkm_wr32(device, 0x405844, 0x00ffffff);
        gr->func->init_419cc0(gr);
-       nvkm_mask(device, 0x419eb4, 0x00001000, 0x00001000);
+       gr->func->init_419eb4(gr);
 
        gr->func->init_ppc_exceptions(gr);
 
@@ -534,6 +534,7 @@ gk104_gr = {
        .init_fecs_exceptions = gk104_gr_init_fecs_exceptions,
        .init_sked_hww_esr = gk104_gr_init_sked_hww_esr,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gf100_gr_init_419eb4,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .mmio = gk104_gr_pack_mmio,
        .fecs.ucode = &gk104_gr_fecs_ucode,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
index bea0cd3..daaa449 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
@@ -334,6 +334,20 @@ gk110_gr_gpccs_ucode = {
        .data.size = sizeof(gk110_grgpc_data),
 };
 
+void
+gk110_gr_init_419eb4(struct gf100_gr *gr)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+       nvkm_mask(device, 0x419eb4, 0x00001000, 0x00001000);
+       nvkm_mask(device, 0x419eb4, 0x00002000, 0x00002000);
+       nvkm_mask(device, 0x419eb4, 0x00004000, 0x00004000);
+       nvkm_mask(device, 0x419eb4, 0x00008000, 0x00008000);
+       nvkm_mask(device, 0x419eb4, 0x00001000, 0x00000000);
+       nvkm_mask(device, 0x419eb4, 0x00002000, 0x00000000);
+       nvkm_mask(device, 0x419eb4, 0x00004000, 0x00000000);
+       nvkm_mask(device, 0x419eb4, 0x00008000, 0x00000000);
+}
+
 static const struct gf100_gr_func
 gk110_gr = {
        .init = gk104_gr_init,
@@ -345,6 +359,7 @@ gk110_gr = {
        .init_fecs_exceptions = gf100_gr_init_fecs_exceptions,
        .init_sked_hww_esr = gk104_gr_init_sked_hww_esr,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gk110_gr_init_419eb4,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .mmio = gk110_gr_pack_mmio,
        .fecs.ucode = &gk110_gr_fecs_ucode,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
index e4ae88d..ee56b00 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
@@ -111,6 +111,7 @@ gk110b_gr = {
        .init_fecs_exceptions = gf100_gr_init_fecs_exceptions,
        .init_sked_hww_esr = gk104_gr_init_sked_hww_esr,
        .init_419cc0 = gf100_gr_init_419cc0,
+       .init_419eb4 = gk110_gr_init_419eb4,
        .init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
        .mmio = gk110b_gr_pack_mmio,
        .fecs.ucode = &gk110_gr_fecs_ucode,