drm/nouveau/mc/tu102: rename implementation from tu104

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
index b66dedd8abb6aae949058a2ccc57c86ea5ea4f65..e38f4958dea2c3ad1abe0a3b0d7344dfd005df5c 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
@@ -31,5 +31,5 @@ int gk104_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
 int gk20a_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
 int gp100_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
 int gp10b_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
-int tu104_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
+int tu102_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 325c4c0ba274f716daab628ae3830102c6f80ebf..bc4ddb7bb66be3be2f7468ff60d2433164b0918c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2449,7 +2449,7 @@ nv162_chipset = {
        .ibus = gm200_ibus_new,
        .imem = nv50_instmem_new,
        .ltc = gp102_ltc_new,
-       .mc = tu104_mc_new,
+       .mc = tu102_mc_new,
        .mmu = tu104_mmu_new,
        .pci = gp100_pci_new,
        .pmu = gp102_pmu_new,
@@ -2481,7 +2481,7 @@ nv164_chipset = {
        .ibus = gm200_ibus_new,
        .imem = nv50_instmem_new,
        .ltc = gp102_ltc_new,
-       .mc = tu104_mc_new,
+       .mc = tu102_mc_new,
        .mmu = tu104_mmu_new,
        .pci = gp100_pci_new,
        .pmu = gp102_pmu_new,
@@ -2513,7 +2513,7 @@ nv166_chipset = {
        .ibus = gm200_ibus_new,
        .imem = nv50_instmem_new,
        .ltc = gp102_ltc_new,
-       .mc = tu104_mc_new,
+       .mc = tu102_mc_new,
        .mmu = tu104_mmu_new,
        .pci = gp100_pci_new,
        .pmu = gp102_pmu_new,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
index f3b06329c338bf43223d6f05ef278e25ce7ef01f..c64e399326b3293a98319e28c219057b4c318b7a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
@@ -12,4 +12,4 @@ nvkm-y += nvkm/subdev/mc/gk104.o
 nvkm-y += nvkm/subdev/mc/gk20a.o
 nvkm-y += nvkm/subdev/mc/gp100.o
 nvkm-y += nvkm/subdev/mc/gp10b.o
-nvkm-y += nvkm/subdev/mc/tu104.o
+nvkm-y += nvkm/subdev/mc/tu102.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c
new file mode 100644 (file)
index 0000000..d098c44
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "priv.h"
+
+static void
+tu102_mc_intr_hack(struct nvkm_mc *mc, bool *handled)
+{
+       struct nvkm_device *device = mc->subdev.device;
+       u32 stat = nvkm_rd32(device, 0xb81010);
+       if (stat & 0x00000050) {
+               struct nvkm_subdev *subdev =
+                       nvkm_device_subdev(device, NVKM_SUBDEV_FAULT);
+               nvkm_wr32(device, 0xb81010, stat & 0x00000050);
+               if (subdev)
+                       nvkm_subdev_intr(subdev);
+               *handled = true;
+       }
+}
+
+static const struct nvkm_mc_func
+tu102_mc = {
+       .init = nv50_mc_init,
+       .intr = gp100_mc_intr,
+       .intr_unarm = gp100_mc_intr_unarm,
+       .intr_rearm = gp100_mc_intr_rearm,
+       .intr_mask = gp100_mc_intr_mask,
+       .intr_stat = gf100_mc_intr_stat,
+       .intr_hack = tu102_mc_intr_hack,
+       .reset = gk104_mc_reset,
+};
+
+int
+tu102_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc)
+{
+       return gp100_mc_new_(&tu102_mc, device, index, pmc);
+}

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu104.c
deleted file mode 100644 (file)
index b7165bd..0000000
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu104.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2018 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "priv.h"
-
-static void
-tu104_mc_intr_hack(struct nvkm_mc *mc, bool *handled)
-{
-       struct nvkm_device *device = mc->subdev.device;
-       u32 stat = nvkm_rd32(device, 0xb81010);
-       if (stat & 0x00000050) {
-               struct nvkm_subdev *subdev =
-                       nvkm_device_subdev(device, NVKM_SUBDEV_FAULT);
-               nvkm_wr32(device, 0xb81010, stat & 0x00000050);
-               if (subdev)
-                       nvkm_subdev_intr(subdev);
-               *handled = true;
-       }
-}
-
-static const struct nvkm_mc_func
-tu104_mc = {
-       .init = nv50_mc_init,
-       .intr = gp100_mc_intr,
-       .intr_unarm = gp100_mc_intr_unarm,
-       .intr_rearm = gp100_mc_intr_rearm,
-       .intr_mask = gp100_mc_intr_mask,
-       .intr_stat = gf100_mc_intr_stat,
-       .intr_hack = tu104_mc_intr_hack,
-       .reset = gk104_mc_reset,
-};
-
-int
-tu104_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc)
-{
-       return gp100_mc_new_(&tu104_mc, device, index, pmc);
-}