Commit c011b254 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent fd95bfbd

drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -130,5 +130,5 @@ int gm20b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **); 
int gp100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gp10b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gv100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int tu104_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int tu102_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

#endif

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+3 −3
Original line number Diff line number Diff line
@@ -2450,7 +2450,7 @@ nv162_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gp102_ltc_new,

	.mc = tu102_mc_new,

	.mmu = tu104_mmu_new,

	.mmu = tu102_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.therm = gp100_therm_new,
@@ -2482,7 +2482,7 @@ nv164_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gp102_ltc_new,

	.mc = tu102_mc_new,

	.mmu = tu104_mmu_new,

	.mmu = tu102_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.therm = gp100_therm_new,
@@ -2514,7 +2514,7 @@ nv166_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gp102_ltc_new,

	.mc = tu102_mc_new,

	.mmu = tu104_mmu_new,

	.mmu = tu102_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.therm = gp100_therm_new,

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ nvkm-y += nvkm/subdev/mmu/gm20b.o 
nvkm-y += nvkm/subdev/mmu/gp100.o

nvkm-y += nvkm/subdev/mmu/gp10b.o

nvkm-y += nvkm/subdev/mmu/gv100.o

nvkm-y += nvkm/subdev/mmu/tu104.o

nvkm-y += nvkm/subdev/mmu/tu102.o



nvkm-y += nvkm/subdev/mmu/mem.o

nvkm-y += nvkm/subdev/mmu/memnv04.o
@@ -34,7 +34,7 @@ nvkm-y += nvkm/subdev/mmu/vmmgm20b.o 
nvkm-y += nvkm/subdev/mmu/vmmgp100.o

nvkm-y += nvkm/subdev/mmu/vmmgp10b.o

nvkm-y += nvkm/subdev/mmu/vmmgv100.o

nvkm-y += nvkm/subdev/mmu/vmmtu104.o

nvkm-y += nvkm/subdev/mmu/vmmtu102.o



nvkm-y += nvkm/subdev/mmu/umem.o

nvkm-y += nvkm/subdev/mmu/ummu.o

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu104.c→drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c

+4 −4
Original line number Diff line number Diff line
@@ -27,17 +27,17 @@ 
#include <nvif/class.h>



static const struct nvkm_mmu_func

tu104_mmu = {

tu102_mmu = {

	.dma_bits = 47,

	.mmu = {{ -1, -1, NVIF_CLASS_MMU_GF100}},

	.mem = {{ -1,  0, NVIF_CLASS_MEM_GF100}, gf100_mem_new, gf100_mem_map },

	.vmm = {{ -1,  0, NVIF_CLASS_VMM_GP100}, tu104_vmm_new },

	.vmm = {{ -1,  0, NVIF_CLASS_VMM_GP100}, tu102_vmm_new },

	.kind = gm200_mmu_kind,

	.kind_sys = true,

};



int

tu104_mmu_new(struct nvkm_device *device, int index, struct nvkm_mmu **pmmu)

tu102_mmu_new(struct nvkm_device *device, int index, struct nvkm_mmu **pmmu)

{

	return nvkm_mmu_new_(&tu104_mmu, device, index, pmmu);

	return nvkm_mmu_new_(&tu102_mmu, device, index, pmmu);

}

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ int gp10b_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32, 
int gv100_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,

		  struct lock_class_key *, const char *,

		  struct nvkm_vmm **);

int tu104_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,

int tu102_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,

		  struct lock_class_key *, const char *,

		  struct nvkm_vmm **);