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

drm/nouveau/nvif: give every mem object a human-readable identifier 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent b495396c

drivers/gpu/drm/nouveau/dispnv50/crc.c

+3 −3
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ nv50_crc_ctx_init(struct nv50_head *head, struct nvif_mmu *mmu, 
	struct nv50_core *core = nv50_disp(head->base.base.dev)->core;

	int ret;



	ret = nvif_mem_init_map(mmu, NVIF_MEM_VRAM, len, &ctx->mem);

	ret = nvif_mem_ctor_map(mmu, "kmsCrcNtfy", NVIF_MEM_VRAM, len, &ctx->mem);

	if (ret)

		return ret;
@@ -531,7 +531,7 @@ nv50_crc_ctx_init(struct nv50_head *head, struct nvif_mmu *mmu, 
	return 0;



fail_fini:

	nvif_mem_fini(&ctx->mem);

	nvif_mem_dtor(&ctx->mem);

	return ret;

}
@@ -539,7 +539,7 @@ static inline void 
nv50_crc_ctx_fini(struct nv50_crc_notifier_ctx *ctx)

{

	nvif_object_dtor(&ctx->ntfy);

	nvif_mem_fini(&ctx->mem);

	nvif_mem_dtor(&ctx->mem);

}



int nv50_crc_set_source(struct drm_crtc *crtc, const char *source_str)

drivers/gpu/drm/nouveau/dispnv50/disp.c

+3 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ nv50_dmac_destroy(struct nv50_dmac *dmac) 


	nv50_chan_destroy(&dmac->base);



	nvif_mem_fini(&dmac->push);

	nvif_mem_dtor(&dmac->push);

}



int
@@ -140,7 +140,8 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, 
	if (device->info.family == NV_DEVICE_INFO_V0_PASCAL)

		type |= NVIF_MEM_VRAM;



	ret = nvif_mem_init_map(&cli->mmu, type, 0x1000, &dmac->push);

	ret = nvif_mem_ctor_map(&cli->mmu, "kmsChanPush", type, 0x1000,

				&dmac->push);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/dispnv50/lut.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ nv50_lut_fini(struct nv50_lut *lut) 
{

	int i;

	for (i = 0; i < ARRAY_SIZE(lut->mem); i++)

		nvif_mem_fini(&lut->mem[i]);

		nvif_mem_dtor(&lut->mem[i]);

}



int
@@ -70,8 +70,8 @@ nv50_lut_init(struct nv50_disp *disp, struct nvif_mmu *mmu, 
	const u32 size = disp->disp->object.oclass < GF110_DISP ? 257 : 1025;

	int i;

	for (i = 0; i < ARRAY_SIZE(lut->mem); i++) {

		int ret = nvif_mem_init_map(mmu, NVIF_MEM_VRAM, size * 8,

					    &lut->mem[i]);

		int ret = nvif_mem_ctor_map(mmu, "kmsLut", NVIF_MEM_VRAM,

					    size * 8, &lut->mem[i]);

		if (ret)

			return ret;

	}

drivers/gpu/drm/nouveau/include/nvif/mem.h

+8 −6
Original line number Diff line number Diff line
@@ -10,11 +10,13 @@ struct nvif_mem { 
	u64 size;

};



int nvif_mem_init_type(struct nvif_mmu *mmu, s32 oclass, int type, u8 page,

		       u64 size, void *argv, u32 argc, struct nvif_mem *);

int nvif_mem_init(struct nvif_mmu *mmu, s32 oclass, u8 type, u8 page,

		  u64 size, void *argv, u32 argc, struct nvif_mem *);

void nvif_mem_fini(struct nvif_mem *);

int nvif_mem_ctor_type(struct nvif_mmu *mmu, const char *name, s32 oclass,

		       int type, u8 page, u64 size, void *argv, u32 argc,

		       struct nvif_mem *);

int nvif_mem_ctor(struct nvif_mmu *mmu, const char *name, s32 oclass, u8 type,

		  u8 page, u64 size, void *argv, u32 argc, struct nvif_mem *);

void nvif_mem_dtor(struct nvif_mem *);



int nvif_mem_init_map(struct nvif_mmu *, u8 type, u64 size, struct nvif_mem *);

int nvif_mem_ctor_map(struct nvif_mmu *, const char *name, u8 type, u64 size,

		      struct nvif_mem *);

#endif

drivers/gpu/drm/nouveau/nouveau_mem.c

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ nouveau_mem_fini(struct nouveau_mem *mem) 
	nvif_vmm_put(&mem->cli->drm->client.vmm.vmm, &mem->vma[1]);

	nvif_vmm_put(&mem->cli->drm->client.vmm.vmm, &mem->vma[0]);

	mutex_lock(&mem->cli->drm->master.lock);

	nvif_mem_fini(&mem->mem);

	nvif_mem_dtor(&mem->mem);

	mutex_unlock(&mem->cli->drm->master.lock);

}
@@ -121,7 +121,7 @@ nouveau_mem_host(struct ttm_mem_reg *reg, struct ttm_dma_tt *tt) 


	mutex_lock(&drm->master.lock);

	cli->base.super = true;

	ret = nvif_mem_init_type(mmu, cli->mem->oclass, type, PAGE_SHIFT,

	ret = nvif_mem_ctor_type(mmu, "ttmHostMem", cli->mem->oclass, type, PAGE_SHIFT,

				 reg->num_pages << PAGE_SHIFT,

				 &args, sizeof(args), &mem->mem);

	cli->base.super = super;
@@ -144,7 +144,7 @@ nouveau_mem_vram(struct ttm_mem_reg *reg, bool contig, u8 page) 
	cli->base.super = true;

	switch (cli->mem->oclass) {

	case NVIF_CLASS_MEM_GF100:

		ret = nvif_mem_init_type(mmu, cli->mem->oclass,

		ret = nvif_mem_ctor_type(mmu, "ttmVram", cli->mem->oclass,

					 drm->ttm.type_vram, page, size,

					 &(struct gf100_mem_v0) {

						.contig = contig,
@@ -152,7 +152,7 @@ nouveau_mem_vram(struct ttm_mem_reg *reg, bool contig, u8 page) 
					 &mem->mem);

		break;

	case NVIF_CLASS_MEM_NV50:

		ret = nvif_mem_init_type(mmu, cli->mem->oclass,

		ret = nvif_mem_ctor_type(mmu, "ttmVram", cli->mem->oclass,

					 drm->ttm.type_vram, page, size,

					 &(struct nv50_mem_v0) {

						.bankswz = mmu->kind[mem->kind] == 2,

CRA Git | Maintained and supported by SUSTech CRA and CCSE