drm/amdgpu: add amdgpu_bo_create_reserved
Same as amdgpu_bo_create_kernel, but keeps the BO reserved. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
53766e5ada
commit
9d903cbd99
|
@ -220,7 +220,7 @@ static void amdgpu_fill_placement_to_bo(struct amdgpu_bo *bo,
|
|||
}
|
||||
|
||||
/**
|
||||
* amdgpu_bo_create_kernel - create BO for kernel use
|
||||
* amdgpu_bo_create_reserved - create reserved BO for kernel use
|
||||
*
|
||||
* @adev: amdgpu device object
|
||||
* @size: size for the new BO
|
||||
|
@ -230,14 +230,15 @@ static void amdgpu_fill_placement_to_bo(struct amdgpu_bo *bo,
|
|||
* @gpu_addr: GPU addr of the pinned BO
|
||||
* @cpu_addr: optional CPU address mapping
|
||||
*
|
||||
* Allocates and pins a BO for kernel internal use.
|
||||
* Allocates and pins a BO for kernel internal use, and returns it still
|
||||
* reserved.
|
||||
*
|
||||
* Returns 0 on success, negative error code otherwise.
|
||||
*/
|
||||
int amdgpu_bo_create_kernel(struct amdgpu_device *adev,
|
||||
unsigned long size, int align,
|
||||
u32 domain, struct amdgpu_bo **bo_ptr,
|
||||
u64 *gpu_addr, void **cpu_addr)
|
||||
int amdgpu_bo_create_reserved(struct amdgpu_device *adev,
|
||||
unsigned long size, int align,
|
||||
u32 domain, struct amdgpu_bo **bo_ptr,
|
||||
u64 *gpu_addr, void **cpu_addr)
|
||||
{
|
||||
bool free = false;
|
||||
int r;
|
||||
|
@ -275,8 +276,6 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev,
|
|||
}
|
||||
}
|
||||
|
||||
amdgpu_bo_unreserve(*bo_ptr);
|
||||
|
||||
return 0;
|
||||
|
||||
error_unreserve:
|
||||
|
@ -289,6 +288,39 @@ error_free:
|
|||
return r;
|
||||
}
|
||||
|
||||
/**
|
||||
* amdgpu_bo_create_kernel - create BO for kernel use
|
||||
*
|
||||
* @adev: amdgpu device object
|
||||
* @size: size for the new BO
|
||||
* @align: alignment for the new BO
|
||||
* @domain: where to place it
|
||||
* @bo_ptr: resulting BO
|
||||
* @gpu_addr: GPU addr of the pinned BO
|
||||
* @cpu_addr: optional CPU address mapping
|
||||
*
|
||||
* Allocates and pins a BO for kernel internal use.
|
||||
*
|
||||
* Returns 0 on success, negative error code otherwise.
|
||||
*/
|
||||
int amdgpu_bo_create_kernel(struct amdgpu_device *adev,
|
||||
unsigned long size, int align,
|
||||
u32 domain, struct amdgpu_bo **bo_ptr,
|
||||
u64 *gpu_addr, void **cpu_addr)
|
||||
{
|
||||
int r;
|
||||
|
||||
r = amdgpu_bo_create_reserved(adev, size, align, domain, bo_ptr,
|
||||
gpu_addr, cpu_addr);
|
||||
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
amdgpu_bo_unreserve(*bo_ptr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* amdgpu_bo_free_kernel - free BO for kernel use
|
||||
*
|
||||
|
|
|
@ -201,6 +201,10 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
|
|||
struct ttm_placement *placement,
|
||||
struct reservation_object *resv,
|
||||
struct amdgpu_bo **bo_ptr);
|
||||
int amdgpu_bo_create_reserved(struct amdgpu_device *adev,
|
||||
unsigned long size, int align,
|
||||
u32 domain, struct amdgpu_bo **bo_ptr,
|
||||
u64 *gpu_addr, void **cpu_addr);
|
||||
int amdgpu_bo_create_kernel(struct amdgpu_device *adev,
|
||||
unsigned long size, int align,
|
||||
u32 domain, struct amdgpu_bo **bo_ptr,
|
||||
|
|
Loading…
Reference in New Issue