drm/nouveau/fifo/gm107-: remove engines from mmu engine mapping array

These are specified by PTOP on Maxwell GPUs.

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
index e720402e728ab32d9f797cd424ac7876c296d83b..679f3ec311e9bf2558f33ceee7e4a26ca33031f6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
@@ -81,4 +81,6 @@ extern const struct nvkm_enum gk104_fifo_fault_engine[];
 extern const struct nvkm_enum gk104_fifo_fault_reason[];
 extern const struct nvkm_enum gk104_fifo_fault_hubclient[];
 extern const struct nvkm_enum gk104_fifo_fault_gpcclient[];
+
+extern const struct nvkm_enum gm107_fifo_fault_engine[];
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c
index 39ab736b131002240705e9d257ae6075bba2727a..bd1ff877aa0687c70193faba68659af5ce08856e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c
@@ -24,9 +24,32 @@
 #include "gk104.h"
 #include "changk104.h"
 
+const struct nvkm_enum
+gm107_fifo_fault_engine[] = {
+       { 0x01, "DISPLAY" },
+       { 0x02, "CAPTURE" },
+       { 0x03, "IFB", NULL, NVKM_ENGINE_IFB },
+       { 0x04, "BAR1", NULL, NVKM_SUBDEV_BAR },
+       { 0x05, "BAR2", NULL, NVKM_SUBDEV_INSTMEM },
+       { 0x06, "SCHED" },
+       { 0x07, "HOST0" },
+       { 0x08, "HOST1" },
+       { 0x09, "HOST2" },
+       { 0x0a, "HOST3" },
+       { 0x0b, "HOST4" },
+       { 0x0c, "HOST5" },
+       { 0x0d, "HOST6" },
+       { 0x0e, "HOST7" },
+       { 0x0f, "HOSTSR" },
+       { 0x13, "PERF" },
+       { 0x17, "PMU" },
+       { 0x18, "PTP" },
+       {}
+};
+
 static const struct gk104_fifo_func
 gm107_fifo = {
-       .fault.engine = gk104_fifo_fault_engine,
+       .fault.engine = gm107_fifo_fault_engine,
        .fault.reason = gk104_fifo_fault_reason,
        .fault.hubclient = gk104_fifo_fault_hubclient,
        .fault.gpcclient = gk104_fifo_fault_gpcclient,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c
index bdfeb4049d0887d95135a9b6348f6bb23eb88c24..b069f785c5d8b51e9ee7bda88a504312508afaf2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c
@@ -26,7 +26,7 @@
 
 static const struct gk104_fifo_func
 gm200_fifo = {
-       .fault.engine = gk104_fifo_fault_engine,
+       .fault.engine = gm107_fifo_fault_engine,
        .fault.reason = gk104_fifo_fault_reason,
        .fault.hubclient = gk104_fifo_fault_hubclient,
        .fault.gpcclient = gk104_fifo_fault_gpcclient,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c
index eea93f86a89980be7d70cad29e237f883eb9297b..2ed87c2e829966767d83b9f4ab03c97e4a61c0c2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c
@@ -24,7 +24,7 @@
 
 static const struct gk104_fifo_func
 gm20b_fifo = {
-       .fault.engine = gk104_fifo_fault_engine,
+       .fault.engine = gm107_fifo_fault_engine,
        .fault.reason = gk104_fifo_fault_reason,
        .fault.hubclient = gk104_fifo_fault_hubclient,
        .fault.gpcclient = gk104_fifo_fault_gpcclient,