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

Commit 48fe0247 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bar: expose interface to bar2 initialisation 



If we want to be able to hit the instmem fast-path in a few trickier cases,
we need to be more flexible with when we can initialise BAR2 access.

There's probably a decent case to be made for merging BAR/INSTMEM into BUS,
but that's something to ponder another day.

Flushes have been added after the write to bind the instance block,
as later commits will reveal the need for them.

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

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

+2 −0
Original line number Diff line number Diff line
@@ -8,11 +8,13 @@ struct nvkm_bar { 
	struct nvkm_subdev subdev;



	spinlock_t lock;

	bool bar2;



	/* whether the BAR supports to be ioremapped WC or should be uncached */

	bool iomap_uncached;

};



void nvkm_bar_bar2_init(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

+15 −1
Original line number Diff line number Diff line
@@ -45,11 +45,23 @@ 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_init(struct nvkm_device *device)

{

	struct nvkm_bar *bar = device->bar;

	if (bar && bar->subdev.oneinit && !bar->bar2 && bar->func->bar2.init) {

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

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

		bar->bar2 = true;

	}

}



static int

nvkm_bar_fini(struct nvkm_subdev *subdev, bool suspend)

{

	struct nvkm_bar *bar = nvkm_bar(subdev);

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

	bar->bar2 = false;

	return 0;

}
@@ -57,8 +69,10 @@ static int 
nvkm_bar_init(struct nvkm_subdev *subdev)

{

	struct nvkm_bar *bar = nvkm_bar(subdev);

	nvkm_bar_bar2_init(subdev->device);

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

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

	if (bar->func->init)

		bar->func->init(bar);

	return 0;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ g84_bar_func = { 
	.bar1.init = nv50_bar_bar1_init,

	.bar1.fini = nv50_bar_bar1_fini,

	.bar1.wait = nv50_bar_bar1_wait,

	.bar2.init = nv50_bar_bar2_init,

	.bar2.wait = nv50_bar_bar1_wait,

	.kmap = nv50_bar_kmap,

	.umap = nv50_bar_umap,

	.flush = g84_bar_flush,

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

+8 −11
Original line number Diff line number Diff line
@@ -65,19 +65,15 @@ gf100_bar_bar1_init(struct nvkm_bar *base) 
}



void

gf100_bar_init(struct nvkm_bar *base)

gf100_bar_bar2_init(struct nvkm_bar *base)

{

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

	struct gf100_bar *bar = gf100_bar(base);

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

	u32 addr;



	if (bar->bar[0].mem) {

		addr = nvkm_memory_addr(bar->bar[0].mem) >> 12;

	u32 addr = nvkm_memory_addr(bar->bar[0].mem) >> 12;

	if (bar->bar2_halve)

		addr |= 0x40000000;

	nvkm_wr32(device, 0x001714, 0x80000000 | addr);

}

}



static int

gf100_bar_oneinit_bar(struct gf100_bar *bar, struct gf100_barN *bar_vm,
@@ -190,10 +186,11 @@ static const struct nvkm_bar_func 
gf100_bar_func = {

	.dtor = gf100_bar_dtor,

	.oneinit = gf100_bar_oneinit,

	.init = gf100_bar_init,

	.bar1.init = gf100_bar_bar1_init,

	.bar1.fini = gf100_bar_bar1_fini,

	.bar1.wait = gf100_bar_bar1_wait,

	.bar2.init = gf100_bar_bar2_init,

	.bar2.wait = gf100_bar_bar1_wait,

	.kmap = gf100_bar_kmap,

	.umap = gf100_bar_umap,

	.flush = g84_bar_flush,

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

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ int gf100_bar_new_(const struct nvkm_bar_func *, struct nvkm_device *, 
		   int, struct nvkm_bar **);

void *gf100_bar_dtor(struct nvkm_bar *);

int gf100_bar_oneinit(struct nvkm_bar *);

void gf100_bar_init(struct nvkm_bar *);

void gf100_bar_bar1_init(struct nvkm_bar *);

void gf100_bar_bar1_wait(struct nvkm_bar *);

void gf100_bar_bar2_init(struct nvkm_bar *);

int gf100_bar_umap(struct nvkm_bar *, u64, int, struct nvkm_vma *);

#endif