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

Commit 7313cfa4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bar: move bar1 initialisation into its own function 



BAR2 being done for practical reasons, this is just for consistency.

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 269fe32d

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

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ static int 
nvkm_bar_init(struct nvkm_subdev *subdev)

{

	struct nvkm_bar *bar = nvkm_bar(subdev);

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

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

	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
@@ -44,6 +44,8 @@ g84_bar_func = { 
	.dtor = nv50_bar_dtor,

	.oneinit = nv50_bar_oneinit,

	.init = nv50_bar_init,

	.bar1.init = nv50_bar_bar1_init,

	.bar1.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

+19 −3
Original line number Diff line number Diff line
@@ -41,6 +41,23 @@ gf100_bar_umap(struct nvkm_bar *base, u64 size, int type, struct nvkm_vma *vma) 
	return nvkm_vm_get(bar->bar[1].vm, size, type, NV_MEM_ACCESS_RW, vma);

}



void

gf100_bar_bar1_wait(struct nvkm_bar *base)

{

	/* NFI why it's twice. */

	nvkm_bar_flush(base);

	nvkm_bar_flush(base);

}



void

gf100_bar_bar1_init(struct nvkm_bar *base)

{

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

	struct gf100_bar *bar = gf100_bar(base);

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

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

}



void

gf100_bar_init(struct nvkm_bar *base)

{
@@ -48,9 +65,6 @@ gf100_bar_init(struct nvkm_bar *base) 
	struct nvkm_device *device = bar->base.subdev.device;

	u32 addr;



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

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



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

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

		if (bar->bar2_halve)
@@ -171,6 +185,8 @@ gf100_bar_func = { 
	.dtor = gf100_bar_dtor,

	.oneinit = gf100_bar_oneinit,

	.init = gf100_bar_init,

	.bar1.init = gf100_bar_bar1_init,

	.bar1.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

+2 −0
Original line number Diff line number Diff line
@@ -20,5 +20,7 @@ int gf100_bar_new_(const struct nvkm_bar_func *, struct nvkm_device *, 
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 *);

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

#endif

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

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ static const struct nvkm_bar_func 
gk20a_bar_func = {

	.dtor = gf100_bar_dtor,

	.oneinit = gf100_bar_oneinit,

	.init = gf100_bar_init,

	.bar1.init = gf100_bar_bar1_init,

	.bar1.wait = gf100_bar_bar1_wait,

	.umap = gf100_bar_umap,

	.flush = g84_bar_flush,

};