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

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
index fd9d713b611cf4a133985c6311ac53e75fcce86b..da14486317ca22f17040f3661bfaa33aae0d48e3 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
@@ -29,5 +29,5 @@ int gf100_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
 int gk20a_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
 int gm107_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
 int gm20b_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
-int tu104_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
+int tu102_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 5079bdff9187343aa66ee0673eb2953d4acf9124..f87b298b192ff70d2a9f21af8861a2ef5647ca30 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2437,7 +2437,7 @@ nv140_chipset = {
 static const struct nvkm_device_chip
 nv162_chipset = {
        .name = "TU102",
-       .bar = tu104_bar_new,
+       .bar = tu102_bar_new,
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = tu102_devinit_new,
@@ -2469,7 +2469,7 @@ nv162_chipset = {
 static const struct nvkm_device_chip
 nv164_chipset = {
        .name = "TU104",
-       .bar = tu104_bar_new,
+       .bar = tu102_bar_new,
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = tu102_devinit_new,
@@ -2501,7 +2501,7 @@ nv164_chipset = {
 static const struct nvkm_device_chip
 nv166_chipset = {
        .name = "TU106",
-       .bar = tu104_bar_new,
+       .bar = tu102_bar_new,
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
        .devinit = tu102_devinit_new,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild
index ab0282dc07369e801071b2cae4a5c45b844975e5..dc300600c019cc02f1ea3d94eac5a65309c12514 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild
@@ -5,4 +5,4 @@ nvkm-y += nvkm/subdev/bar/gf100.o
 nvkm-y += nvkm/subdev/bar/gk20a.o
 nvkm-y += nvkm/subdev/bar/gm107.o
 nvkm-y += nvkm/subdev/bar/gm20b.o
-nvkm-y += nvkm/subdev/bar/tu104.o
+nvkm-y += nvkm/subdev/bar/tu102.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c
similarity index 84%
rename from drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu104.c
rename to drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c
index ecaead156e9b0177937b75b28495ba4bd901536c..798f65ec3a86c457ea6789205667f93d66d60bbb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c
@@ -25,7 +25,7 @@
 #include <subdev/timer.h>
 
 static void
-tu104_bar_bar2_wait(struct nvkm_bar *bar)
+tu102_bar_bar2_wait(struct nvkm_bar *bar)
 {
        struct nvkm_device *device = bar->subdev.device;
        nvkm_msec(device, 2000,
@@ -35,13 +35,13 @@ tu104_bar_bar2_wait(struct nvkm_bar *bar)
 }
 
 static void
-tu104_bar_bar2_fini(struct nvkm_bar *bar)
+tu102_bar_bar2_fini(struct nvkm_bar *bar)
 {
        nvkm_mask(bar->subdev.device, 0xb80f48, 0x80000000, 0x00000000);
 }
 
 static void
-tu104_bar_bar2_init(struct nvkm_bar *base)
+tu102_bar_bar2_init(struct nvkm_bar *base)
 {
        struct nvkm_device *device = base->subdev.device;
        struct gf100_bar *bar = gf100_bar(base);
@@ -52,7 +52,7 @@ tu104_bar_bar2_init(struct nvkm_bar *base)
 }
 
 static void
-tu104_bar_bar1_wait(struct nvkm_bar *bar)
+tu102_bar_bar1_wait(struct nvkm_bar *bar)
 {
        struct nvkm_device *device = bar->subdev.device;
        nvkm_msec(device, 2000,
@@ -62,13 +62,13 @@ tu104_bar_bar1_wait(struct nvkm_bar *bar)
 }
 
 static void
-tu104_bar_bar1_fini(struct nvkm_bar *bar)
+tu102_bar_bar1_fini(struct nvkm_bar *bar)
 {
        nvkm_mask(bar->subdev.device, 0xb80f40, 0x80000000, 0x00000000);
 }
 
 static void
-tu104_bar_bar1_init(struct nvkm_bar *base)
+tu102_bar_bar1_init(struct nvkm_bar *base)
 {
        struct nvkm_device *device = base->subdev.device;
        struct gf100_bar *bar = gf100_bar(base);
@@ -77,22 +77,22 @@ tu104_bar_bar1_init(struct nvkm_bar *base)
 }
 
 static const struct nvkm_bar_func
-tu104_bar = {
+tu102_bar = {
        .dtor = gf100_bar_dtor,
        .oneinit = gf100_bar_oneinit,
-       .bar1.init = tu104_bar_bar1_init,
-       .bar1.fini = tu104_bar_bar1_fini,
-       .bar1.wait = tu104_bar_bar1_wait,
+       .bar1.init = tu102_bar_bar1_init,
+       .bar1.fini = tu102_bar_bar1_fini,
+       .bar1.wait = tu102_bar_bar1_wait,
        .bar1.vmm = gf100_bar_bar1_vmm,
-       .bar2.init = tu104_bar_bar2_init,
-       .bar2.fini = tu104_bar_bar2_fini,
-       .bar2.wait = tu104_bar_bar2_wait,
+       .bar2.init = tu102_bar_bar2_init,
+       .bar2.fini = tu102_bar_bar2_fini,
+       .bar2.wait = tu102_bar_bar2_wait,
        .bar2.vmm = gf100_bar_bar2_vmm,
        .flush = g84_bar_flush,
 };
 
 int
-tu104_bar_new(struct nvkm_device *device, int index, struct nvkm_bar **pbar)
+tu102_bar_new(struct nvkm_device *device, int index, struct nvkm_bar **pbar)
 {
-       return gf100_bar_new_(&tu104_bar, device, index, pbar);
+       return gf100_bar_new_(&tu102_bar, device, index, pbar);
 }