Commit 6fdd6f4a authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: add amdgpu_bo_vm bo type 



Add new BO subclass that will be used by amdgpu vm code.

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ae4c0d76

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

+32 −0
Original line number Diff line number Diff line
@@ -670,6 +670,38 @@ int amdgpu_bo_create_user(struct amdgpu_device *adev, 
	*ubo_ptr = to_amdgpu_bo_user(bo_ptr);

	return r;

}



/**

 * amdgpu_bo_create_vm - create an &amdgpu_bo_vm buffer object

 * @adev: amdgpu device object

 * @bp: parameters to be used for the buffer object

 * @vmbo_ptr: pointer to the buffer object pointer

 *

 * Create a BO to be for GPUVM.

 *

 * Returns:

 * 0 for success or a negative error code on failure.

 */



int amdgpu_bo_create_vm(struct amdgpu_device *adev,

			struct amdgpu_bo_param *bp,

			struct amdgpu_bo_vm **vmbo_ptr)

{

	struct amdgpu_bo *bo_ptr;

	int r;



	/* bo_ptr_size will be determined by the caller and it depends on

	 * num of amdgpu_vm_pt entries.

	 */

	BUG_ON(bp->bo_ptr_size < sizeof(struct amdgpu_bo_vm));

	r = amdgpu_bo_create(adev, bp, &bo_ptr);

	if (r)

		return r;



	*vmbo_ptr = to_amdgpu_bo_vm(bo_ptr);

	return r;

}



/**

 * amdgpu_bo_validate - validate an &amdgpu_bo buffer object

 * @bo: pointer to the buffer object

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

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define AMDGPU_AMDKFD_CREATE_SVM_BO	(1ULL << 62)



#define to_amdgpu_bo_user(abo) container_of((abo), struct amdgpu_bo_user, bo)

#define to_amdgpu_bo_vm(abo) container_of((abo), struct amdgpu_bo_vm, bo)



struct amdgpu_bo_param {

	unsigned long			size;
@@ -125,6 +126,12 @@ struct amdgpu_bo_user { 


};



struct amdgpu_bo_vm {

	struct amdgpu_bo		bo;

	struct amdgpu_bo		*shadow;

	struct amdgpu_vm_pt             entries[];

};



static inline struct amdgpu_bo *ttm_to_amdgpu_bo(struct ttm_buffer_object *tbo)

{

	return container_of(tbo, struct amdgpu_bo, tbo);
@@ -272,6 +279,9 @@ int amdgpu_bo_create_kernel_at(struct amdgpu_device *adev, 
int amdgpu_bo_create_user(struct amdgpu_device *adev,

			  struct amdgpu_bo_param *bp,

			  struct amdgpu_bo_user **ubo_ptr);

int amdgpu_bo_create_vm(struct amdgpu_device *adev,

			struct amdgpu_bo_param *bp,

			struct amdgpu_bo_vm **ubo_ptr);

void amdgpu_bo_free_kernel(struct amdgpu_bo **bo, u64 *gpu_addr,

			   void **cpu_addr);

int amdgpu_bo_create_shadow(struct amdgpu_device *adev,