Commit 954f9798 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -30,5 +30,5 @@ struct nvkm_fault_data { 


int gp100_fault_new(struct nvkm_device *, int, struct nvkm_fault **);

int gv100_fault_new(struct nvkm_device *, int, struct nvkm_fault **);

int tu104_fault_new(struct nvkm_device *, int, struct nvkm_fault **);

int tu102_fault_new(struct nvkm_device *, int, struct nvkm_fault **);

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -2441,7 +2441,7 @@ nv162_chipset = { 
	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu102_devinit_new,

	.fault = tu104_fault_new,

	.fault = tu102_fault_new,

	.fb = gv100_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,
@@ -2473,7 +2473,7 @@ nv164_chipset = { 
	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu102_devinit_new,

	.fault = tu104_fault_new,

	.fault = tu102_fault_new,

	.fb = gv100_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,
@@ -2505,7 +2505,7 @@ nv166_chipset = { 
	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = tu102_devinit_new,

	.fault = tu104_fault_new,

	.fault = tu102_fault_new,

	.fb = gv100_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

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

+1 −1
Original line number Diff line number Diff line 
nvkm-y += nvkm/subdev/fault/base.o

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

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

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

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

+19 −19
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <nvif/class.h>



static void

tu104_fault_buffer_intr(struct nvkm_fault_buffer *buffer, bool enable)

tu102_fault_buffer_intr(struct nvkm_fault_buffer *buffer, bool enable)

{

	/*XXX: Earlier versions of RM touched the old regs on Turing,

	 *     which don't appear to actually work anymore, but newer
@@ -37,7 +37,7 @@ tu104_fault_buffer_intr(struct nvkm_fault_buffer *buffer, bool enable) 
}



static void

tu104_fault_buffer_fini(struct nvkm_fault_buffer *buffer)

tu102_fault_buffer_fini(struct nvkm_fault_buffer *buffer)

{

	struct nvkm_device *device = buffer->fault->subdev.device;

	const u32 foff = buffer->id * 0x20;
@@ -45,7 +45,7 @@ tu104_fault_buffer_fini(struct nvkm_fault_buffer *buffer) 
}



static void

tu104_fault_buffer_init(struct nvkm_fault_buffer *buffer)

tu102_fault_buffer_init(struct nvkm_fault_buffer *buffer)

{

	struct nvkm_device *device = buffer->fault->subdev.device;

	const u32 foff = buffer->id * 0x20;
@@ -57,7 +57,7 @@ tu104_fault_buffer_init(struct nvkm_fault_buffer *buffer) 
}



static void

tu104_fault_buffer_info(struct nvkm_fault_buffer *buffer)

tu102_fault_buffer_info(struct nvkm_fault_buffer *buffer)

{

	struct nvkm_device *device = buffer->fault->subdev.device;

	const u32 foff = buffer->id * 0x20;
@@ -70,7 +70,7 @@ tu104_fault_buffer_info(struct nvkm_fault_buffer *buffer) 
}



static void

tu104_fault_intr_fault(struct nvkm_fault *fault)

tu102_fault_intr_fault(struct nvkm_fault *fault)

{

	struct nvkm_subdev *subdev = &fault->subdev;

	struct nvkm_device *device = subdev->device;
@@ -96,14 +96,14 @@ tu104_fault_intr_fault(struct nvkm_fault *fault) 
}



static void

tu104_fault_intr(struct nvkm_fault *fault)

tu102_fault_intr(struct nvkm_fault *fault)

{

	struct nvkm_subdev *subdev = &fault->subdev;

	struct nvkm_device *device = subdev->device;

	u32 stat = nvkm_rd32(device, 0xb83094);



	if (stat & 0x80000000) {

		tu104_fault_intr_fault(fault);

		tu102_fault_intr_fault(fault);

		nvkm_wr32(device, 0xb83094, 0x80000000);

		stat &= ~0x80000000;

	}
@@ -129,7 +129,7 @@ tu104_fault_intr(struct nvkm_fault *fault) 
}



static void

tu104_fault_fini(struct nvkm_fault *fault)

tu102_fault_fini(struct nvkm_fault *fault)

{

	nvkm_notify_put(&fault->nrpfb);

	if (fault->buffer[0])
@@ -138,7 +138,7 @@ tu104_fault_fini(struct nvkm_fault *fault) 
}



static void

tu104_fault_init(struct nvkm_fault *fault)

tu102_fault_init(struct nvkm_fault *fault)

{

	/*XXX: enable priv faults */

	fault->func->buffer.init(fault->buffer[0]);
@@ -146,22 +146,22 @@ tu104_fault_init(struct nvkm_fault *fault) 
}



static const struct nvkm_fault_func

tu104_fault = {

tu102_fault = {

	.oneinit = gv100_fault_oneinit,

	.init = tu104_fault_init,

	.fini = tu104_fault_fini,

	.intr = tu104_fault_intr,

	.init = tu102_fault_init,

	.fini = tu102_fault_fini,

	.intr = tu102_fault_intr,

	.buffer.nr = 2,

	.buffer.entry_size = 32,

	.buffer.info = tu104_fault_buffer_info,

	.buffer.init = tu104_fault_buffer_init,

	.buffer.fini = tu104_fault_buffer_fini,

	.buffer.intr = tu104_fault_buffer_intr,

	.buffer.info = tu102_fault_buffer_info,

	.buffer.init = tu102_fault_buffer_init,

	.buffer.fini = tu102_fault_buffer_fini,

	.buffer.intr = tu102_fault_buffer_intr,

};



int

tu104_fault_new(struct nvkm_device *device, int index,

tu102_fault_new(struct nvkm_device *device, int index,

		struct nvkm_fault **pfault)

{

	return nvkm_fault_new_(&tu104_fault, device, index, pfault);

	return nvkm_fault_new_(&tu102_fault, device, index, pfault);

}