Commit 7f507624 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: determine memory class for each client 



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

drivers/gpu/drm/nouveau/nouveau_drm.c

+16 −0
Original line number Diff line number Diff line
@@ -127,6 +127,13 @@ static int 
nouveau_cli_init(struct nouveau_drm *drm, const char *sname,

		 struct nouveau_cli *cli)

{

	static const struct nvif_mclass

	mems[] = {

		{ NVIF_CLASS_MEM_GF100, -1 },

		{ NVIF_CLASS_MEM_NV50 , -1 },

		{ NVIF_CLASS_MEM_NV04 , -1 },

		{}

	};

	static const struct nvif_mclass

	mmus[] = {

		{ NVIF_CLASS_MMU_GF100, -1 },
@@ -201,11 +208,20 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname, 
		goto done;

	}



	ret = nvif_mclass(&cli->mmu.object, mems);

	if (ret < 0) {

		NV_ERROR(drm, "No supported MEM class\n");

		goto done;

	}



	cli->mem = &mems[ret];



	if (1) {

		cli->vm = cli->vmm.vm;

		nvxx_client(&cli->base)->vm = cli->vm;

	}



	return 0;

done:

	if (ret)

		nouveau_cli_fini(cli);

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ struct nouveau_cli { 
	struct nvif_device device;

	struct nvif_mmu mmu;

	struct nouveau_vmm vmm;

	const struct nvif_mclass *mem;



	struct nvkm_vm *vm;

	struct list_head head;