Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d903cbd authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: add amdgpu_bo_create_reserved 



Same as amdgpu_bo_create_kernel, but keeps the BO reserved.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 53766e5a

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+40 −8
Original line number Diff line number Diff line
@@ -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,11 +230,12 @@ 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,

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)
@@ -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 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev, 
	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

 *

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h

+4 −0
Original line number Diff line number Diff line
@@ -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,