Commit c011b254 authored by Ben Skeggs's avatar Ben Skeggs

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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent fd95bfbd
...@@ -130,5 +130,5 @@ int gm20b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **); ...@@ -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 gp100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);
int gp10b_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 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 #endif
...@@ -2450,7 +2450,7 @@ nv162_chipset = { ...@@ -2450,7 +2450,7 @@ nv162_chipset = {
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
.ltc = gp102_ltc_new, .ltc = gp102_ltc_new,
.mc = tu102_mc_new, .mc = tu102_mc_new,
.mmu = tu104_mmu_new, .mmu = tu102_mmu_new,
.pci = gp100_pci_new, .pci = gp100_pci_new,
.pmu = gp102_pmu_new, .pmu = gp102_pmu_new,
.therm = gp100_therm_new, .therm = gp100_therm_new,
...@@ -2482,7 +2482,7 @@ nv164_chipset = { ...@@ -2482,7 +2482,7 @@ nv164_chipset = {
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
.ltc = gp102_ltc_new, .ltc = gp102_ltc_new,
.mc = tu102_mc_new, .mc = tu102_mc_new,
.mmu = tu104_mmu_new, .mmu = tu102_mmu_new,
.pci = gp100_pci_new, .pci = gp100_pci_new,
.pmu = gp102_pmu_new, .pmu = gp102_pmu_new,
.therm = gp100_therm_new, .therm = gp100_therm_new,
...@@ -2514,7 +2514,7 @@ nv166_chipset = { ...@@ -2514,7 +2514,7 @@ nv166_chipset = {
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
.ltc = gp102_ltc_new, .ltc = gp102_ltc_new,
.mc = tu102_mc_new, .mc = tu102_mc_new,
.mmu = tu104_mmu_new, .mmu = tu102_mmu_new,
.pci = gp100_pci_new, .pci = gp100_pci_new,
.pmu = gp102_pmu_new, .pmu = gp102_pmu_new,
.therm = gp100_therm_new, .therm = gp100_therm_new,
......
...@@ -13,7 +13,7 @@ nvkm-y += nvkm/subdev/mmu/gm20b.o ...@@ -13,7 +13,7 @@ nvkm-y += nvkm/subdev/mmu/gm20b.o
nvkm-y += nvkm/subdev/mmu/gp100.o nvkm-y += nvkm/subdev/mmu/gp100.o
nvkm-y += nvkm/subdev/mmu/gp10b.o nvkm-y += nvkm/subdev/mmu/gp10b.o
nvkm-y += nvkm/subdev/mmu/gv100.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/mem.o
nvkm-y += nvkm/subdev/mmu/memnv04.o nvkm-y += nvkm/subdev/mmu/memnv04.o
...@@ -34,7 +34,7 @@ nvkm-y += nvkm/subdev/mmu/vmmgm20b.o ...@@ -34,7 +34,7 @@ nvkm-y += nvkm/subdev/mmu/vmmgm20b.o
nvkm-y += nvkm/subdev/mmu/vmmgp100.o nvkm-y += nvkm/subdev/mmu/vmmgp100.o
nvkm-y += nvkm/subdev/mmu/vmmgp10b.o nvkm-y += nvkm/subdev/mmu/vmmgp10b.o
nvkm-y += nvkm/subdev/mmu/vmmgv100.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/umem.o
nvkm-y += nvkm/subdev/mmu/ummu.o nvkm-y += nvkm/subdev/mmu/ummu.o
......
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
#include <nvif/class.h> #include <nvif/class.h>
static const struct nvkm_mmu_func static const struct nvkm_mmu_func
tu104_mmu = { tu102_mmu = {
.dma_bits = 47, .dma_bits = 47,
.mmu = {{ -1, -1, NVIF_CLASS_MMU_GF100}}, .mmu = {{ -1, -1, NVIF_CLASS_MMU_GF100}},
.mem = {{ -1, 0, NVIF_CLASS_MEM_GF100}, gf100_mem_new, gf100_mem_map }, .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 = gm200_mmu_kind,
.kind_sys = true, .kind_sys = true,
}; };
int 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);
} }
...@@ -242,7 +242,7 @@ int gp10b_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32, ...@@ -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, int gv100_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,
struct lock_class_key *, const char *, struct lock_class_key *, const char *,
struct nvkm_vmm **); 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 lock_class_key *, const char *,
struct nvkm_vmm **); struct nvkm_vmm **);
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <subdev/timer.h> #include <subdev/timer.h>
static void static void
tu104_vmm_flush(struct nvkm_vmm *vmm, int depth) tu102_vmm_flush(struct nvkm_vmm *vmm, int depth)
{ {
struct nvkm_subdev *subdev = &vmm->mmu->subdev; struct nvkm_subdev *subdev = &vmm->mmu->subdev;
struct nvkm_device *device = subdev->device; struct nvkm_device *device = subdev->device;
...@@ -50,12 +50,12 @@ tu104_vmm_flush(struct nvkm_vmm *vmm, int depth) ...@@ -50,12 +50,12 @@ tu104_vmm_flush(struct nvkm_vmm *vmm, int depth)
} }
static const struct nvkm_vmm_func static const struct nvkm_vmm_func
tu104_vmm = { tu102_vmm = {
.join = gv100_vmm_join, .join = gv100_vmm_join,
.part = gf100_vmm_part, .part = gf100_vmm_part,
.aper = gf100_vmm_aper, .aper = gf100_vmm_aper,
.valid = gp100_vmm_valid, .valid = gp100_vmm_valid,
.flush = tu104_vmm_flush, .flush = tu102_vmm_flush,
.page = { .page = {
{ 47, &gp100_vmm_desc_16[4], NVKM_VMM_PAGE_Sxxx }, { 47, &gp100_vmm_desc_16[4], NVKM_VMM_PAGE_Sxxx },
{ 38, &gp100_vmm_desc_16[3], NVKM_VMM_PAGE_Sxxx }, { 38, &gp100_vmm_desc_16[3], NVKM_VMM_PAGE_Sxxx },
...@@ -68,10 +68,10 @@ tu104_vmm = { ...@@ -68,10 +68,10 @@ tu104_vmm = {
}; };
int int
tu104_vmm_new(struct nvkm_mmu *mmu, u64 addr, u64 size, tu102_vmm_new(struct nvkm_mmu *mmu, u64 addr, u64 size,
void *argv, u32 argc, struct lock_class_key *key, void *argv, u32 argc, struct lock_class_key *key,
const char *name, struct nvkm_vmm **pvmm) const char *name, struct nvkm_vmm **pvmm)
{ {
return nv04_vmm_new_(&tu104_vmm, mmu, 0, addr, size, return nv04_vmm_new_(&tu102_vmm, mmu, 0, addr, size,
argv, argc, key, name, pvmm); argv, argc, key, name, pvmm);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment