2024-01-14 15:14:48

by Christophe JAILLET

Subject: [PATCH] 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: Christophe JAILLET <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
index ddd0891da116..3d7fcdeaf8cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
@@ -62,9 +62,8 @@ int amdgpu_pasid_alloc(unsigned int bits)
int pasid = -EINVAL;

for (bits = min(bits, 31U); bits > 0; bits--) {
- pasid = ida_simple_get(&amdgpu_pasid_ida,
- 1U << (bits - 1), 1U << bits,
- GFP_KERNEL);
+ pasid = ida_alloc_range(&amdgpu_pasid_ida, 1U << (bits - 1),
+ (1U << bits) - 1, GFP_KERNEL);
if (pasid != -ENOSPC)
break;
}
@@ -82,7 +81,7 @@ int amdgpu_pasid_alloc(unsigned int bits)
void amdgpu_pasid_free(u32 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,
--
2.43.0

2024-01-15 10:18:20

by Christian König

Subject: Re: [PATCH] drm/amdgpu: Remove usage of the deprecated ida_simple_xx() API

Am 14.01.24 um 16:14 schrieb Christophe JAILLET:
> 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: Christophe JAILLET <[email protected]>

Reviewed-by: Christian König <[email protected]>

> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
> index ddd0891da116..3d7fcdeaf8cf 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
> @@ -62,9 +62,8 @@ int amdgpu_pasid_alloc(unsigned int bits)
> int pasid = -EINVAL;
>
> for (bits = min(bits, 31U); bits > 0; bits--) {
> - pasid = ida_simple_get(&amdgpu_pasid_ida,
> - 1U << (bits - 1), 1U << bits,
> - GFP_KERNEL);
> + pasid = ida_alloc_range(&amdgpu_pasid_ida, 1U << (bits - 1),
> + (1U << bits) - 1, GFP_KERNEL);
> if (pasid != -ENOSPC)
> break;
> }
> @@ -82,7 +81,7 @@ int amdgpu_pasid_alloc(unsigned int bits)
> void amdgpu_pasid_free(u32 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,