mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
drm/gpuvm: add drm_gpuvm_flags to drm_gpuvm
Introduce flags for struct drm_gpuvm, this required by subsequent commits. Acked-by: Christian König <christian.koenig@amd.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Signed-off-by: Danilo Krummrich <dakr@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231108001259.15123-8-dakr@redhat.com
This commit is contained in:
parent
6118411428
commit
809ef191ee
3 changed files with 20 additions and 1 deletions
|
@ -720,6 +720,7 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_resv_object_alloc);
|
||||||
* drm_gpuvm_init() - initialize a &drm_gpuvm
|
* drm_gpuvm_init() - initialize a &drm_gpuvm
|
||||||
* @gpuvm: pointer to the &drm_gpuvm to initialize
|
* @gpuvm: pointer to the &drm_gpuvm to initialize
|
||||||
* @name: the name of the GPU VA space
|
* @name: the name of the GPU VA space
|
||||||
|
* @flags: the &drm_gpuvm_flags for this GPUVM
|
||||||
* @drm: the &drm_device this VM resides in
|
* @drm: the &drm_device this VM resides in
|
||||||
* @r_obj: the resv &drm_gem_object providing the GPUVM's common &dma_resv
|
* @r_obj: the resv &drm_gem_object providing the GPUVM's common &dma_resv
|
||||||
* @start_offset: the start offset of the GPU VA space
|
* @start_offset: the start offset of the GPU VA space
|
||||||
|
@ -735,6 +736,7 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_resv_object_alloc);
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name,
|
drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name,
|
||||||
|
enum drm_gpuvm_flags flags,
|
||||||
struct drm_device *drm,
|
struct drm_device *drm,
|
||||||
struct drm_gem_object *r_obj,
|
struct drm_gem_object *r_obj,
|
||||||
u64 start_offset, u64 range,
|
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);
|
INIT_LIST_HEAD(&gpuvm->rb.list);
|
||||||
|
|
||||||
gpuvm->name = name ? name : "unknown";
|
gpuvm->name = name ? name : "unknown";
|
||||||
|
gpuvm->flags = flags;
|
||||||
gpuvm->ops = ops;
|
gpuvm->ops = ops;
|
||||||
gpuvm->drm = drm;
|
gpuvm->drm = drm;
|
||||||
gpuvm->r_obj = r_obj;
|
gpuvm->r_obj = r_obj;
|
||||||
|
|
|
@ -1828,7 +1828,7 @@ nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli,
|
||||||
goto out_unlock;
|
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_START,
|
||||||
NOUVEAU_VA_SPACE_END,
|
NOUVEAU_VA_SPACE_END,
|
||||||
kernel_managed_addr, kernel_managed_size,
|
kernel_managed_addr, kernel_managed_size,
|
||||||
|
|
|
@ -184,6 +184,16 @@ static inline bool drm_gpuva_invalidated(struct drm_gpuva *va)
|
||||||
return va->flags & DRM_GPUVA_INVALIDATED;
|
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
|
* struct drm_gpuvm - DRM GPU VA Manager
|
||||||
*
|
*
|
||||||
|
@ -202,6 +212,11 @@ struct drm_gpuvm {
|
||||||
*/
|
*/
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @flags: the &drm_gpuvm_flags of this GPUVM
|
||||||
|
*/
|
||||||
|
enum drm_gpuvm_flags flags;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @drm: the &drm_device this VM lives in
|
* @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,
|
void drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name,
|
||||||
|
enum drm_gpuvm_flags flags,
|
||||||
struct drm_device *drm,
|
struct drm_device *drm,
|
||||||
struct drm_gem_object *r_obj,
|
struct drm_gem_object *r_obj,
|
||||||
u64 start_offset, u64 range,
|
u64 start_offset, u64 range,
|
||||||
|
|
Loading…
Reference in a new issue