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

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -31,5 +31,5 @@ int gf100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **); 
int gm107_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int gm200_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int gv100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int tu104_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int tu102_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -2440,7 +2440,7 @@ nv162_chipset = { 
	.bar = tu104_bar_new,

	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu104_devinit_new,

	.devinit = tu102_devinit_new,

	.fault = tu104_fault_new,

	.fb = gv100_fb_new,

	.fuse = gm107_fuse_new,
@@ -2472,7 +2472,7 @@ nv164_chipset = { 
	.bar = tu104_bar_new,

	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu104_devinit_new,

	.devinit = tu102_devinit_new,

	.fault = tu104_fault_new,

	.fb = gv100_fb_new,

	.fuse = gm107_fuse_new,
@@ -2504,7 +2504,7 @@ nv166_chipset = { 
	.bar = tu104_bar_new,

	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu104_devinit_new,

	.devinit = tu102_devinit_new,

	.fault = tu104_fault_new,

	.fb = gv100_fb_new,

	.fuse = gm107_fuse_new,

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

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ nvkm-y += nvkm/subdev/devinit/gf100.o 
nvkm-y += nvkm/subdev/devinit/gm107.o

nvkm-y += nvkm/subdev/devinit/gm200.o

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

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

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

+7 −7
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <subdev/clk/pll.h>



static int

tu104_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)

tu102_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)

{

	struct nvkm_subdev *subdev = &init->subdev;

	struct nvkm_device *device = subdev->device;
@@ -66,7 +66,7 @@ tu104_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq) 
}



static int

tu104_devinit_post(struct nvkm_devinit *base, bool post)

tu102_devinit_post(struct nvkm_devinit *base, bool post)

{

	struct nv50_devinit *init = nv50_devinit(base);

	gm200_devinit_preos(init, post);
@@ -74,16 +74,16 @@ tu104_devinit_post(struct nvkm_devinit *base, bool post) 
}



static const struct nvkm_devinit_func

tu104_devinit = {

tu102_devinit = {

	.init = nv50_devinit_init,

	.post = tu104_devinit_post,

	.pll_set = tu104_devinit_pll_set,

	.post = tu102_devinit_post,

	.pll_set = tu102_devinit_pll_set,

	.disable = gm107_devinit_disable,

};



int

tu104_devinit_new(struct nvkm_device *device, int index,

tu102_devinit_new(struct nvkm_device *device, int index,

		struct nvkm_devinit **pinit)

{

	return nv50_devinit_new_(&tu104_devinit, device, index, pinit);

	return nv50_devinit_new_(&tu102_devinit, device, index, pinit);

}