Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/nouveau/bar: expose interface to bar2 teardown 



Will prevent spurious MMU fault interrupts if something decides to touch
BAR1 after we've unloaded the driver.

Exposed external to BAR so that INSTMEM can use it to better control the
suspend/resume fast-path access.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct nvkm_bar { 
};



void nvkm_bar_bar2_init(struct nvkm_device *);

void nvkm_bar_bar2_fini(struct nvkm_device *);

void nvkm_bar_flush(struct nvkm_bar *);

struct nvkm_vm *nvkm_bar_kmap(struct nvkm_bar *);

int nvkm_bar_umap(struct nvkm_bar *, u64 size, int type, struct nvkm_vma *);

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

+11 −1
Original line number Diff line number Diff line
@@ -45,6 +45,16 @@ nvkm_bar_umap(struct nvkm_bar *bar, u64 size, int type, struct nvkm_vma *vma) 
	return bar->func->umap(bar, size, type, vma);

}



void

nvkm_bar_bar2_fini(struct nvkm_device *device)

{

	struct nvkm_bar *bar = device->bar;

	if (bar && bar->bar2) {

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

		bar->bar2 = false;

	}

}



void

nvkm_bar_bar2_init(struct nvkm_device *device)

{
@@ -61,7 +71,7 @@ nvkm_bar_fini(struct nvkm_subdev *subdev, bool suspend) 
{

	struct nvkm_bar *bar = nvkm_bar(subdev);

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

	bar->bar2 = false;

	nvkm_bar_bar2_fini(subdev->device);

	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ g84_bar_func = { 
	.bar1.fini = nv50_bar_bar1_fini,

	.bar1.wait = nv50_bar_bar1_wait,

	.bar2.init = nv50_bar_bar2_init,

	.bar2.fini = nv50_bar_bar2_fini,

	.bar2.wait = nv50_bar_bar1_wait,

	.kmap = nv50_bar_kmap,

	.umap = nv50_bar_umap,

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

+7 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ gf100_bar_bar1_init(struct nvkm_bar *base) 
	nvkm_wr32(device, 0x001704, 0x80000000 | addr);

}



void

gf100_bar_bar2_fini(struct nvkm_bar *bar)

{

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

}



void

gf100_bar_bar2_init(struct nvkm_bar *base)

{
@@ -190,6 +196,7 @@ gf100_bar_func = { 
	.bar1.fini = gf100_bar_bar1_fini,

	.bar1.wait = gf100_bar_bar1_wait,

	.bar2.init = gf100_bar_bar2_init,

	.bar2.fini = gf100_bar_bar2_fini,

	.bar2.wait = gf100_bar_bar1_wait,

	.kmap = gf100_bar_kmap,

	.umap = gf100_bar_umap,

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

+7 −0
Original line number Diff line number Diff line
@@ -76,6 +76,12 @@ nv50_bar_bar1_init(struct nvkm_bar *base) 
	nvkm_wr32(device, 0x001708, 0x80000000 | bar->bar1->node->offset >> 4);

}



void

nv50_bar_bar2_fini(struct nvkm_bar *bar)

{

	nvkm_wr32(bar->subdev.device, 0x00170c, 0x00000000);

}



void

nv50_bar_bar2_init(struct nvkm_bar *base)

{
@@ -224,6 +230,7 @@ nv50_bar_func = { 
	.bar1.fini = nv50_bar_bar1_fini,

	.bar1.wait = nv50_bar_bar1_wait,

	.bar2.init = nv50_bar_bar2_init,

	.bar2.fini = nv50_bar_bar2_fini,

	.bar2.wait = nv50_bar_bar1_wait,

	.kmap = nv50_bar_kmap,

	.umap = nv50_bar_umap,