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

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -31,5 +31,5 @@ int gk104_mc_new(struct nvkm_device *, int, struct nvkm_mc **); 
int gk20a_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gp100_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gp10b_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int tu104_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int tu102_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -2449,7 +2449,7 @@ nv162_chipset = { 
	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,

	.ltc = gp102_ltc_new,

	.mc = tu104_mc_new,

	.mc = tu102_mc_new,

	.mmu = tu104_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,
@@ -2481,7 +2481,7 @@ nv164_chipset = { 
	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,

	.ltc = gp102_ltc_new,

	.mc = tu104_mc_new,

	.mc = tu102_mc_new,

	.mmu = tu104_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,
@@ -2513,7 +2513,7 @@ nv166_chipset = { 
	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,

	.ltc = gp102_ltc_new,

	.mc = tu104_mc_new,

	.mc = tu102_mc_new,

	.mmu = tu104_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

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

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ nvkm-y += nvkm/subdev/mc/gk104.o 
nvkm-y += nvkm/subdev/mc/gk20a.o

nvkm-y += nvkm/subdev/mc/gp100.o

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

nvkm-y += nvkm/subdev/mc/tu104.o
 
nvkm-y += nvkm/subdev/mc/tu102.o

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

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "priv.h"



static void

tu104_mc_intr_hack(struct nvkm_mc *mc, bool *handled)

tu102_mc_intr_hack(struct nvkm_mc *mc, bool *handled)

{

	struct nvkm_device *device = mc->subdev.device;

	u32 stat = nvkm_rd32(device, 0xb81010);
@@ -37,19 +37,19 @@ tu104_mc_intr_hack(struct nvkm_mc *mc, bool *handled) 
}



static const struct nvkm_mc_func

tu104_mc = {

tu102_mc = {

	.init = nv50_mc_init,

	.intr = gp100_mc_intr,

	.intr_unarm = gp100_mc_intr_unarm,

	.intr_rearm = gp100_mc_intr_rearm,

	.intr_mask = gp100_mc_intr_mask,

	.intr_stat = gf100_mc_intr_stat,

	.intr_hack = tu104_mc_intr_hack,

	.intr_hack = tu102_mc_intr_hack,

	.reset = gk104_mc_reset,

};



int

tu104_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc)

tu102_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc)

{

	return gp100_mc_new_(&tu104_mc, device, index, pmc);

	return gp100_mc_new_(&tu102_mc, device, index, pmc);

}