Commit 302daab1 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo/gf100-: call into BAR to reset BARs after MMU fault 



This is needed for Turing, but we're supposed to wait for completion after
re-writing the value on older GPUs anyway.

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

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

+2 −0
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ struct nvkm_bar { 
};



struct nvkm_vmm *nvkm_bar_bar1_vmm(struct nvkm_device *);

void nvkm_bar_bar1_reset(struct nvkm_device *);

void nvkm_bar_bar2_init(struct nvkm_device *);

void nvkm_bar_bar2_fini(struct nvkm_device *);

void nvkm_bar_bar2_reset(struct nvkm_device *);

struct nvkm_vmm *nvkm_bar_bar2_vmm(struct nvkm_device *);

void nvkm_bar_flush(struct nvkm_bar *);

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c

+2 −2
Original line number Diff line number Diff line
@@ -346,10 +346,10 @@ gf100_fifo_intr_fault(struct gf100_fifo *fifo, int unit) 
	if (eu && eu->data2) {

		switch (eu->data2) {

		case NVKM_SUBDEV_BAR:

			nvkm_mask(device, 0x001704, 0x00000000, 0x00000000);

			nvkm_bar_bar1_reset(device);

			break;

		case NVKM_SUBDEV_INSTMEM:

			nvkm_mask(device, 0x001714, 0x00000000, 0x00000000);

			nvkm_bar_bar2_reset(device);

			break;

		case NVKM_ENGINE_IFB:

			nvkm_mask(device, 0x001718, 0x00000000, 0x00000000);

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c

+2 −2
Original line number Diff line number Diff line
@@ -456,10 +456,10 @@ gk104_fifo_fault(struct nvkm_fifo *base, struct nvkm_fault_data *info) 
	if (ee && ee->data2) {

		switch (ee->data2) {

		case NVKM_SUBDEV_BAR:

			nvkm_mask(device, 0x001704, 0x00000000, 0x00000000);

			nvkm_bar_bar1_reset(device);

			break;

		case NVKM_SUBDEV_INSTMEM:

			nvkm_mask(device, 0x001714, 0x00000000, 0x00000000);

			nvkm_bar_bar2_reset(device);

			break;

		case NVKM_ENGINE_IFB:

			nvkm_mask(device, 0x001718, 0x00000000, 0x00000000);

drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c

+20 −0
Original line number Diff line number Diff line
@@ -36,6 +36,16 @@ nvkm_bar_bar1_vmm(struct nvkm_device *device) 
	return device->bar->func->bar1.vmm(device->bar);

}



void

nvkm_bar_bar1_reset(struct nvkm_device *device)

{

	struct nvkm_bar *bar = device->bar;

	if (bar) {

		bar->func->bar1.init(bar);

		bar->func->bar1.wait(bar);

	}

}



struct nvkm_vmm *

nvkm_bar_bar2_vmm(struct nvkm_device *device)

{
@@ -48,6 +58,16 @@ nvkm_bar_bar2_vmm(struct nvkm_device *device) 
	return NULL;

}



void

nvkm_bar_bar2_reset(struct nvkm_device *device)

{

	struct nvkm_bar *bar = device->bar;

	if (bar && bar->bar2) {

		bar->func->bar2.init(bar);

		bar->func->bar2.wait(bar);

	}

}



void

nvkm_bar_bar2_fini(struct nvkm_device *device)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE