diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-16 15:01:37 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-16 15:18:48 +1000 |
| commit | 58a17894679d922f8dc0af5dbf01eb57e8809d20 (patch) | |
| tree | cc62e4688ad5c93a5a8e5303a68969ff073cf532 | |
| parent | 34ddbf09cbc37fca43a3874ad49005aa72149b80 (diff) | |
| download | nouveau-58a17894679d922f8dc0af5dbf01eb57e8809d20.tar.gz | |
ce/gp102: rename from gp104
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/include/nvkm/engine/ce.h | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/ce/Kbuild | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/ce/gp102.c (renamed from drm/nouveau/nvkm/engine/ce/gp104.c) | 6 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/device/base.c | 16 |
4 files changed, 13 insertions, 13 deletions
diff --git a/drm/nouveau/include/nvkm/engine/ce.h b/drm/nouveau/include/nvkm/engine/ce.h index d3d26a1e2..b93f4c1a9 100644 --- a/drm/nouveau/include/nvkm/engine/ce.h +++ b/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/drm/nouveau/nvkm/engine/ce/Kbuild b/drm/nouveau/nvkm/engine/ce/Kbuild index a4458a8eb..255d81ccf 100644 --- a/drm/nouveau/nvkm/engine/ce/Kbuild +++ b/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/drm/nouveau/nvkm/engine/ce/gp104.c b/drm/nouveau/nvkm/engine/ce/gp102.c index 20e019788..985c8f653 100644 --- a/drm/nouveau/nvkm/engine/ce/gp104.c +++ b/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/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c index 7d6a012a6..62b13b52e 100644 --- a/drm/nouveau/nvkm/engine/device/base.c +++ b/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, |