drm/nouveau/ce/gp102: rename from gp104

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
index d3d26a1e215dacc0d94d180bd4cdea4f89ebb48a..b93f4c1a95e550394c875a46c16ee1eecc8753bd 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
@@ -8,5 +8,5 @@ int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
 int gm107_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
 int gm200_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
 int gp100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
-int gp104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
+int gp102_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
index a4458a8eb30a7f5da77dee8960cf7aaf81e6914e..255d81ccf9166979faa89bc458b06bd8c59d4982 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
@@ -4,4 +4,4 @@ nvkm-y += nvkm/engine/ce/gk104.o
 nvkm-y += nvkm/engine/ce/gm107.o
 nvkm-y += nvkm/engine/ce/gm200.o
 nvkm-y += nvkm/engine/ce/gp100.o
-nvkm-y += nvkm/engine/ce/gp104.o
+nvkm-y += nvkm/engine/ce/gp102.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c
similarity index 91%
rename from drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c
index 20e019788a536b46011e640ad5f5349a70ef6e5e..985c8f653874d2a066ad683634ea776d390ac6ec 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c
@@ -27,7 +27,7 @@
 #include <nvif/class.h>
 
 static const struct nvkm_engine_func
-gp104_ce = {
+gp102_ce = {
        .intr = gp100_ce_intr,
        .sclass = {
                { -1, -1, PASCAL_DMA_COPY_B },
@@ -37,8 +37,8 @@ gp104_ce = {
 };
 
 int
-gp104_ce_new(struct nvkm_device *device, int index,
+gp102_ce_new(struct nvkm_device *device, int index,
             struct nvkm_engine **pengine)
 {
-       return nvkm_engine_new_(&gp104_ce, device, index, true, pengine);
+       return nvkm_engine_new_(&gp102_ce, device, index, true, pengine);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 7d6a012a6b69b731da1a6b96f7e7d1837070c0da..62b13b52e75a3a19e064f82354ba540c2770a364 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2203,10 +2203,10 @@ nv132_chipset = {
        .pmu = gp102_pmu_new,
        .timer = gk20a_timer_new,
        .top = gk104_top_new,
-       .ce[0] = gp104_ce_new,
-       .ce[1] = gp104_ce_new,
-       .ce[2] = gp104_ce_new,
-       .ce[3] = gp104_ce_new,
+       .ce[0] = gp102_ce_new,
+       .ce[1] = gp102_ce_new,
+       .ce[2] = gp102_ce_new,
+       .ce[3] = gp102_ce_new,
        .disp = gp104_disp_new,
        .dma = gf119_dma_new,
        .fifo = gp100_fifo_new,
@@ -2232,10 +2232,10 @@ nv134_chipset = {
        .pmu = gp102_pmu_new,
        .timer = gk20a_timer_new,
        .top = gk104_top_new,
-       .ce[0] = gp104_ce_new,
-       .ce[1] = gp104_ce_new,
-       .ce[2] = gp104_ce_new,
-       .ce[3] = gp104_ce_new,
+       .ce[0] = gp102_ce_new,
+       .ce[1] = gp102_ce_new,
+       .ce[2] = gp102_ce_new,
+       .ce[3] = gp102_ce_new,
        .disp = gp104_disp_new,
        .dma = gf119_dma_new,
        .fifo = gp100_fifo_new,