Commit 18cf073f authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher

drm/amdgpu: use a macro to define no xcp partition case

~0 as no xcp partition is used in several places, so improve its
definition by a macro for code consistency.
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e379b5e7
...@@ -1709,7 +1709,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( ...@@ -1709,7 +1709,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
alloc_flags |= (flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) ? alloc_flags |= (flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) ?
AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED : 0; AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED : 0;
} }
xcp_id = fpriv->xcp_id == ~0 ? 0 : fpriv->xcp_id; xcp_id = fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION ?
0 : fpriv->xcp_id;
} else if (flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) { } else if (flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
domain = alloc_domain = AMDGPU_GEM_DOMAIN_GTT; domain = alloc_domain = AMDGPU_GEM_DOMAIN_GTT;
alloc_flags = 0; alloc_flags = 0;
......
...@@ -363,7 +363,7 @@ int amdgpu_xcp_open_device(struct amdgpu_device *adev, ...@@ -363,7 +363,7 @@ int amdgpu_xcp_open_device(struct amdgpu_device *adev,
if (!adev->xcp_mgr) if (!adev->xcp_mgr)
return 0; return 0;
fpriv->xcp_id = ~0; fpriv->xcp_id = AMDGPU_XCP_NO_PARTITION;
for (i = 0; i < MAX_XCP; ++i) { for (i = 0; i < MAX_XCP; ++i) {
if (!adev->xcp_mgr->xcp[i].ddev) if (!adev->xcp_mgr->xcp[i].ddev)
break; break;
...@@ -381,7 +381,7 @@ int amdgpu_xcp_open_device(struct amdgpu_device *adev, ...@@ -381,7 +381,7 @@ int amdgpu_xcp_open_device(struct amdgpu_device *adev,
} }
} }
fpriv->vm.mem_id = fpriv->xcp_id == ~0 ? -1 : fpriv->vm.mem_id = fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION ? -1 :
adev->xcp_mgr->xcp[fpriv->xcp_id].mem_id; adev->xcp_mgr->xcp[fpriv->xcp_id].mem_id;
return 0; return 0;
} }
......
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#define AMDGPU_XCP_FL_NONE 0 #define AMDGPU_XCP_FL_NONE 0
#define AMDGPU_XCP_FL_LOCKED (1 << 0) #define AMDGPU_XCP_FL_LOCKED (1 << 0)
#define AMDGPU_XCP_NO_PARTITION (~0)
struct amdgpu_fpriv; struct amdgpu_fpriv;
enum AMDGPU_XCP_IP_BLOCK { enum AMDGPU_XCP_IP_BLOCK {
......
...@@ -68,7 +68,7 @@ static void aqua_vanjaram_set_xcp_id(struct amdgpu_device *adev, ...@@ -68,7 +68,7 @@ static void aqua_vanjaram_set_xcp_id(struct amdgpu_device *adev,
enum AMDGPU_XCP_IP_BLOCK ip_blk; enum AMDGPU_XCP_IP_BLOCK ip_blk;
uint32_t inst_mask; uint32_t inst_mask;
ring->xcp_id = ~0; ring->xcp_id = AMDGPU_XCP_NO_PARTITION;
if (adev->xcp_mgr->mode == AMDGPU_XCP_MODE_NONE) if (adev->xcp_mgr->mode == AMDGPU_XCP_MODE_NONE)
return; return;
...@@ -177,7 +177,7 @@ static int aqua_vanjaram_select_scheds( ...@@ -177,7 +177,7 @@ static int aqua_vanjaram_select_scheds(
u32 sel_xcp_id; u32 sel_xcp_id;
int i; int i;
if (fpriv->xcp_id == ~0) { if (fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION) {
u32 least_ref_cnt = ~0; u32 least_ref_cnt = ~0;
fpriv->xcp_id = 0; fpriv->xcp_id = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment