drm/xe/guc: 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_max() is inclusive. So a -1 has been added when needed.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d6a9ec9dc426fca372eaa1423a83632bd743c5d9.1705244938.git.christophe.jaillet@wanadoo.fr

diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index bbcd47737a59728f78acced773bd921b253372d3..3ac51162cfa723f0aaaf205c9f0429e3111e8d6d 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -312,7 +312,7 @@ static void __release_guc_id(struct xe_guc *guc, struct xe_exec_queue *q, u32 xa
                                      q->guc->id - GUC_ID_START_MLRC,
                                      order_base_2(q->width));
        else
-               ida_simple_remove(&guc->submission_state.guc_ids, q->guc->id);
+               ida_free(&guc->submission_state.guc_ids, q->guc->id);
 }
 
 static int alloc_guc_id(struct xe_guc *guc, struct xe_exec_queue *q)
@@ -336,8 +336,8 @@ static int alloc_guc_id(struct xe_guc *guc, struct xe_exec_queue *q)
                ret = bitmap_find_free_region(bitmap, GUC_ID_NUMBER_MLRC,
                                              order_base_2(q->width));
        } else {
-               ret = ida_simple_get(&guc->submission_state.guc_ids, 0,
-                                    GUC_ID_NUMBER_SLRC, GFP_NOWAIT);
+               ret = ida_alloc_max(&guc->submission_state.guc_ids,
+                                   GUC_ID_NUMBER_SLRC - 1, GFP_NOWAIT);
        }
        if (ret < 0)
                return ret;