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 ad18ef91d34e564ede0ce1e42aee1d22116d4b64..947278274846e6aa59b52aea6efbda76f0ac2b73 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1914,6 +1914,13 @@ gf100_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device,
        return 0;
 }
 
+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)
 {
@@ -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 cab0948f507dbd8d27c12e2ea882c96d91093c3d..1dae373fa0d746a44375377e76cab36f82763cf7 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 8598e15b40affdc2379ec0e3cea3fa1c63b1ae09..59d4dac97d8c5c2aa6f19bc187508c96677dd482 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 83c71ff51a2e20f4d8e7a056213b5ca441cc7ba3..73cb23a71c522c9202567b625212a53e28099eb9 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 b2b44890ae955f3475b13d8989c5031893092081..1d7188e844f5f275064b6baa984705b6f095dd34 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 ec91a595affe511ffac53aeda2eaa46f5ac689fa..34655676ce39c571c0bca3e06008e7b52e138d4b 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 570527f0370c61507e5b5faea02e56bba1b92aa3..28c00cb1999554e6ce526bb467bb62f9cb63bb3a 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 dcd59af25420202d937101d20205dc5c73a637dc..775b4742848648fb7cc6d7be863b9b626b96aff2 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 bea0cd324a72ac400be88e3735d63efc14754d47..daaa4492d764e3a3af92959e6a5d7bc877849232 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 e4ae88de895858a0f7abc76879102d9a34dada0a..ee56b00c25d04f3b4eb470b29876cd7905bf8332 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,