Commit a3540b46 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

drm/nouveau: uvmm: remove dedicated VM pointer from VMAs 



VMAs can find their corresponding VM through their embedded struct
drm_gpuva which already carries a pointer to a struct drm_gpuva_manager
which the VM is based on. Hence, remove the struct nouveau_uvmm pointer
from struct nouveau_uvma to save a couple of bytes per mapping.

Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230807163238.2091-6-dakr@redhat.com
parent 3cbc7721

drivers/gpu/drm/nouveau/nouveau_uvmm.c

+4 −5
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ nouveau_uvma_vmm_put(struct nouveau_uvma *uvma) 
	u64 addr = uvma->va.va.addr;

	u64 range = uvma->va.va.range;



	return nouveau_uvmm_vmm_put(uvma->uvmm, addr, range);

	return nouveau_uvmm_vmm_put(to_uvmm(uvma), addr, range);

}



static int
@@ -192,7 +192,7 @@ nouveau_uvma_map(struct nouveau_uvma *uvma, 
	u64 offset = uvma->va.gem.offset;

	u64 range = uvma->va.va.range;



	return nouveau_uvmm_vmm_map(uvma->uvmm, addr, range,

	return nouveau_uvmm_vmm_map(to_uvmm(uvma), addr, range,

				    offset, uvma->kind, mem);

}
@@ -206,7 +206,7 @@ nouveau_uvma_unmap(struct nouveau_uvma *uvma) 
	if (drm_gpuva_invalidated(&uvma->va))

		return 0;



	return nouveau_uvmm_vmm_unmap(uvma->uvmm, addr, range, sparse);

	return nouveau_uvmm_vmm_unmap(to_uvmm(uvma), addr, range, sparse);

}



static int
@@ -586,7 +586,6 @@ op_map_prepare(struct nouveau_uvmm *uvmm, 
	if (ret)

		return ret;



	uvma->uvmm = uvmm;

	uvma->region = args->region;

	uvma->kind = args->kind;
@@ -794,7 +793,7 @@ op_unmap_range(struct drm_gpuva_op_unmap *u, 
	bool sparse = !!uvma->region;



	if (!drm_gpuva_invalidated(u->va))

		nouveau_uvmm_vmm_unmap(uvma->uvmm, addr, range, sparse);

		nouveau_uvmm_vmm_unmap(to_uvmm(uvma), addr, range, sparse);

}



static void

drivers/gpu/drm/nouveau/nouveau_uvmm.h

+5 −5
Original line number Diff line number Diff line
@@ -37,12 +37,15 @@ struct nouveau_uvma_region { 
struct nouveau_uvma {

	struct drm_gpuva va;



	struct nouveau_uvmm *uvmm;

	struct nouveau_uvma_region *region;



	u8 kind;

};



#define uvmm_from_mgr(x) container_of((x), struct nouveau_uvmm, umgr)

#define uvma_from_va(x) container_of((x), struct nouveau_uvma, va)



#define to_uvmm(x) uvmm_from_mgr((x)->va.mgr)



struct nouveau_uvmm_bind_job {

	struct nouveau_job base;
@@ -79,9 +82,6 @@ struct nouveau_uvmm_bind_job_args { 


#define to_uvmm_bind_job(job) container_of((job), struct nouveau_uvmm_bind_job, base)



#define uvmm_from_mgr(x) container_of((x), struct nouveau_uvmm, umgr)

#define uvma_from_va(x) container_of((x), struct nouveau_uvma, va)



int nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli,

		      u64 kernel_managed_addr, u64 kernel_managed_size);

void nouveau_uvmm_fini(struct nouveau_uvmm *uvmm);