Commit 809ef191 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

drm/gpuvm: add drm_gpuvm_flags to drm_gpuvm 



Introduce flags for struct drm_gpuvm, this required by subsequent
commits.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231108001259.15123-8-dakr@redhat.com
parent 61184114

drivers/gpu/drm/drm_gpuvm.c

+3 −0
Original line number Diff line number Diff line
@@ -720,6 +720,7 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_resv_object_alloc); 
 * drm_gpuvm_init() - initialize a &drm_gpuvm

 * @gpuvm: pointer to the &drm_gpuvm to initialize

 * @name: the name of the GPU VA space

 * @flags: the &drm_gpuvm_flags for this GPUVM

 * @drm: the &drm_device this VM resides in

 * @r_obj: the resv &drm_gem_object providing the GPUVM's common &dma_resv

 * @start_offset: the start offset of the GPU VA space
@@ -735,6 +736,7 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_resv_object_alloc); 
 */

void

drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name,

	       enum drm_gpuvm_flags flags,

	       struct drm_device *drm,

	       struct drm_gem_object *r_obj,

	       u64 start_offset, u64 range,
@@ -745,6 +747,7 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, 
	INIT_LIST_HEAD(&gpuvm->rb.list);



	gpuvm->name = name ? name : "unknown";

	gpuvm->flags = flags;

	gpuvm->ops = ops;

	gpuvm->drm = drm;

	gpuvm->r_obj = r_obj;

drivers/gpu/drm/nouveau/nouveau_uvmm.c

+1 −1
Original line number Diff line number Diff line
@@ -1828,7 +1828,7 @@ nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli, 
		goto out_unlock;

	}



	drm_gpuvm_init(&uvmm->base, cli->name, drm, r_obj,

	drm_gpuvm_init(&uvmm->base, cli->name, 0, drm, r_obj,

		       NOUVEAU_VA_SPACE_START,

		       NOUVEAU_VA_SPACE_END,

		       kernel_managed_addr, kernel_managed_size,

include/drm/drm_gpuvm.h

+16 −0
Original line number Diff line number Diff line
@@ -184,6 +184,16 @@ static inline bool drm_gpuva_invalidated(struct drm_gpuva *va) 
	return va->flags & DRM_GPUVA_INVALIDATED;

}



/**

 * enum drm_gpuvm_flags - flags for struct drm_gpuvm

 */

enum drm_gpuvm_flags {

	/**

	 * @DRM_GPUVM_USERBITS: user defined bits

	 */

	DRM_GPUVM_USERBITS = BIT(0),

};



/**

 * struct drm_gpuvm - DRM GPU VA Manager

 *
@@ -202,6 +212,11 @@ struct drm_gpuvm { 
	 */

	const char *name;



	/**

	 * @flags: the &drm_gpuvm_flags of this GPUVM

	 */

	enum drm_gpuvm_flags flags;



	/**

	 * @drm: the &drm_device this VM lives in

	 */
@@ -252,6 +267,7 @@ struct drm_gpuvm { 
};



void drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name,

		    enum drm_gpuvm_flags flags,

		    struct drm_device *drm,

		    struct drm_gem_object *r_obj,

		    u64 start_offset, u64 range,