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

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ int gf100_bar_new(struct nvkm_device *, int, struct nvkm_bar **); 
int gk20a_bar_new(struct nvkm_device *, int, struct nvkm_bar **);

int gm107_bar_new(struct nvkm_device *, int, struct nvkm_bar **);

int gm20b_bar_new(struct nvkm_device *, int, struct nvkm_bar **);

int tu104_bar_new(struct nvkm_device *, int, struct nvkm_bar **);

int tu102_bar_new(struct nvkm_device *, int, struct nvkm_bar **);

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -2437,7 +2437,7 @@ nv140_chipset = { 
static const struct nvkm_device_chip

nv162_chipset = {

	.name = "TU102",

	.bar = tu104_bar_new,

	.bar = tu102_bar_new,

	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu102_devinit_new,
@@ -2469,7 +2469,7 @@ nv162_chipset = { 
static const struct nvkm_device_chip

nv164_chipset = {

	.name = "TU104",

	.bar = tu104_bar_new,

	.bar = tu102_bar_new,

	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu102_devinit_new,
@@ -2501,7 +2501,7 @@ nv164_chipset = { 
static const struct nvkm_device_chip

nv166_chipset = {

	.name = "TU106",

	.bar = tu104_bar_new,

	.bar = tu102_bar_new,

	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu102_devinit_new,

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

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ nvkm-y += nvkm/subdev/bar/gf100.o 
nvkm-y += nvkm/subdev/bar/gk20a.o

nvkm-y += nvkm/subdev/bar/gm107.o

nvkm-y += nvkm/subdev/bar/gm20b.o

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

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

+15 −15
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <subdev/timer.h>



static void

tu104_bar_bar2_wait(struct nvkm_bar *bar)

tu102_bar_bar2_wait(struct nvkm_bar *bar)

{

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

	nvkm_msec(device, 2000,
@@ -35,13 +35,13 @@ tu104_bar_bar2_wait(struct nvkm_bar *bar) 
}



static void

tu104_bar_bar2_fini(struct nvkm_bar *bar)

tu102_bar_bar2_fini(struct nvkm_bar *bar)

{

	nvkm_mask(bar->subdev.device, 0xb80f48, 0x80000000, 0x00000000);

}



static void

tu104_bar_bar2_init(struct nvkm_bar *base)

tu102_bar_bar2_init(struct nvkm_bar *base)

{

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

	struct gf100_bar *bar = gf100_bar(base);
@@ -52,7 +52,7 @@ tu104_bar_bar2_init(struct nvkm_bar *base) 
}



static void

tu104_bar_bar1_wait(struct nvkm_bar *bar)

tu102_bar_bar1_wait(struct nvkm_bar *bar)

{

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

	nvkm_msec(device, 2000,
@@ -62,13 +62,13 @@ tu104_bar_bar1_wait(struct nvkm_bar *bar) 
}



static void

tu104_bar_bar1_fini(struct nvkm_bar *bar)

tu102_bar_bar1_fini(struct nvkm_bar *bar)

{

	nvkm_mask(bar->subdev.device, 0xb80f40, 0x80000000, 0x00000000);

}



static void

tu104_bar_bar1_init(struct nvkm_bar *base)

tu102_bar_bar1_init(struct nvkm_bar *base)

{

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

	struct gf100_bar *bar = gf100_bar(base);
@@ -77,22 +77,22 @@ tu104_bar_bar1_init(struct nvkm_bar *base) 
}



static const struct nvkm_bar_func

tu104_bar = {

tu102_bar = {

	.dtor = gf100_bar_dtor,

	.oneinit = gf100_bar_oneinit,

	.bar1.init = tu104_bar_bar1_init,

	.bar1.fini = tu104_bar_bar1_fini,

	.bar1.wait = tu104_bar_bar1_wait,

	.bar1.init = tu102_bar_bar1_init,

	.bar1.fini = tu102_bar_bar1_fini,

	.bar1.wait = tu102_bar_bar1_wait,

	.bar1.vmm = gf100_bar_bar1_vmm,

	.bar2.init = tu104_bar_bar2_init,

	.bar2.fini = tu104_bar_bar2_fini,

	.bar2.wait = tu104_bar_bar2_wait,

	.bar2.init = tu102_bar_bar2_init,

	.bar2.fini = tu102_bar_bar2_fini,

	.bar2.wait = tu102_bar_bar2_wait,

	.bar2.vmm = gf100_bar_bar2_vmm,

	.flush = g84_bar_flush,

};



int

tu104_bar_new(struct nvkm_device *device, int index, struct nvkm_bar **pbar)

tu102_bar_new(struct nvkm_device *device, int index, struct nvkm_bar **pbar)

{

	return gf100_bar_new_(&tu104_bar, device, index, pbar);

	return gf100_bar_new_(&tu102_bar, device, index, pbar);

}