Skip to content

Commit b13d3e9

Browse files
Guchun Chenalexdeucher
authored andcommitted
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: Christian König <[email protected]> Signed-off-by: Guchun Chen <[email protected]> Reviewed-by: Felix Kuehling <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 8e78127 commit b13d3e9

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
17091709
alloc_flags |= (flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) ?
17101710
AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED : 0;
17111711
}
1712-
xcp_id = fpriv->xcp_id == ~0 ? 0 : fpriv->xcp_id;
1712+
xcp_id = fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION ?
1713+
0 : fpriv->xcp_id;
17131714
} else if (flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
17141715
domain = alloc_domain = AMDGPU_GEM_DOMAIN_GTT;
17151716
alloc_flags = 0;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ int amdgpu_xcp_open_device(struct amdgpu_device *adev,
363363
if (!adev->xcp_mgr)
364364
return 0;
365365

366-
fpriv->xcp_id = ~0;
366+
fpriv->xcp_id = AMDGPU_XCP_NO_PARTITION;
367367
for (i = 0; i < MAX_XCP; ++i) {
368368
if (!adev->xcp_mgr->xcp[i].ddev)
369369
break;
@@ -381,7 +381,7 @@ int amdgpu_xcp_open_device(struct amdgpu_device *adev,
381381
}
382382
}
383383

384-
fpriv->vm.mem_id = fpriv->xcp_id == ~0 ? -1 :
384+
fpriv->vm.mem_id = fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION ? -1 :
385385
adev->xcp_mgr->xcp[fpriv->xcp_id].mem_id;
386386
return 0;
387387
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
#define AMDGPU_XCP_FL_NONE 0
3838
#define AMDGPU_XCP_FL_LOCKED (1 << 0)
3939

40+
#define AMDGPU_XCP_NO_PARTITION (~0)
41+
4042
struct amdgpu_fpriv;
4143

4244
enum AMDGPU_XCP_IP_BLOCK {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static void aqua_vanjaram_set_xcp_id(struct amdgpu_device *adev,
6868
enum AMDGPU_XCP_IP_BLOCK ip_blk;
6969
uint32_t inst_mask;
7070

71-
ring->xcp_id = ~0;
71+
ring->xcp_id = AMDGPU_XCP_NO_PARTITION;
7272
if (adev->xcp_mgr->mode == AMDGPU_XCP_MODE_NONE)
7373
return;
7474

@@ -177,7 +177,7 @@ static int aqua_vanjaram_select_scheds(
177177
u32 sel_xcp_id;
178178
int i;
179179

180-
if (fpriv->xcp_id == ~0) {
180+
if (fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION) {
181181
u32 least_ref_cnt = ~0;
182182

183183
fpriv->xcp_id = 0;

0 commit comments

Comments
 (0)