Commit f04c79cf authored by Alex Sierra's avatar Alex Sierra Committed by Alex Deucher
Browse files

drm/amdgpu: add param bit flag to create SVM BOs 



Add CREATE_SVM_BO define bit for SVM BOs.
Another define flag was moved to concentrate these
KFD type flags in one include file.

Signed-off-by: default avatarAlex Sierra <alex.sierra@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eb2cec55

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

+2 −5
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
#include <uapi/linux/kfd_ioctl.h>

#include "amdgpu_xgmi.h"



/* BO flag to indicate a KFD userptr BO */

#define AMDGPU_AMDKFD_USERPTR_BO (1ULL << 63)



/* Userptr restore delay, just long enough to allow consecutive VM

 * changes to accumulate

 */
@@ -222,7 +219,7 @@ void amdgpu_amdkfd_unreserve_memory_limit(struct amdgpu_bo *bo) 
	u32 domain = bo->preferred_domains;

	bool sg = (bo->preferred_domains == AMDGPU_GEM_DOMAIN_CPU);



	if (bo->flags & AMDGPU_AMDKFD_USERPTR_BO) {

	if (bo->flags & AMDGPU_AMDKFD_CREATE_USERPTR_BO) {

		domain = AMDGPU_GEM_DOMAIN_CPU;

		sg = false;

	}
@@ -1241,7 +1238,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	bo->kfd_bo = *mem;

	(*mem)->bo = bo;

	if (user_addr)

		bo->flags |= AMDGPU_AMDKFD_USERPTR_BO;

		bo->flags |= AMDGPU_AMDKFD_CREATE_USERPTR_BO;



	(*mem)->va = va;

	(*mem)->domain = domain;

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

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
#define AMDGPU_BO_INVALID_OFFSET	LONG_MAX

#define AMDGPU_BO_MAX_PLACEMENTS	3



/* BO flag to indicate a KFD userptr BO */

#define AMDGPU_AMDKFD_CREATE_USERPTR_BO	(1ULL << 63)

#define AMDGPU_AMDKFD_CREATE_SVM_BO	(1ULL << 62)



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



struct amdgpu_bo_param {