Commit 8a1f7fdd authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Alex Deucher

drm/amdgpu: Remove usage of the deprecated ida_simple_xx() API

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_range() is inclusive. So a -1 has been added when needed.
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 733965a9
...@@ -62,9 +62,8 @@ int amdgpu_pasid_alloc(unsigned int bits) ...@@ -62,9 +62,8 @@ int amdgpu_pasid_alloc(unsigned int bits)
int pasid = -EINVAL; int pasid = -EINVAL;
for (bits = min(bits, 31U); bits > 0; bits--) { for (bits = min(bits, 31U); bits > 0; bits--) {
pasid = ida_simple_get(&amdgpu_pasid_ida, pasid = ida_alloc_range(&amdgpu_pasid_ida, 1U << (bits - 1),
1U << (bits - 1), 1U << bits, (1U << bits) - 1, GFP_KERNEL);
GFP_KERNEL);
if (pasid != -ENOSPC) if (pasid != -ENOSPC)
break; break;
} }
...@@ -82,7 +81,7 @@ int amdgpu_pasid_alloc(unsigned int bits) ...@@ -82,7 +81,7 @@ int amdgpu_pasid_alloc(unsigned int bits)
void amdgpu_pasid_free(u32 pasid) void amdgpu_pasid_free(u32 pasid)
{ {
trace_amdgpu_pasid_freed(pasid); trace_amdgpu_pasid_freed(pasid);
ida_simple_remove(&amdgpu_pasid_ida, pasid); ida_free(&amdgpu_pasid_ida, pasid);
} }
static void amdgpu_pasid_free_cb(struct dma_fence *fence, static void amdgpu_pasid_free_cb(struct dma_fence *fence,
......
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