Unverified Commit 2af231e1 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Rodrigo Vivi
Browse files

drm/i915/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_range() is inclusive. So a -1 has been added when needed.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7108c1871c6cb08d403c4fa6534bc7e6de4cb23d.1705245316.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 3563d855

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

+6 −7
Original line number Diff line number Diff line
@@ -2215,11 +2215,10 @@ static int new_guc_id(struct intel_guc *guc, struct intel_context *ce) 
					      order_base_2(ce->parallel.number_children

							   + 1));

	else

		ret = ida_simple_get(&guc->submission_state.guc_ids,

		ret = ida_alloc_range(&guc->submission_state.guc_ids,

				      NUMBER_MULTI_LRC_GUC_ID(guc),

				     guc->submission_state.num_guc_ids,

				     GFP_KERNEL | __GFP_RETRY_MAYFAIL |

				     __GFP_NOWARN);

				      guc->submission_state.num_guc_ids - 1,

				      GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN);

	if (unlikely(ret < 0))

		return ret;
@@ -2242,7 +2241,7 @@ static void __release_guc_id(struct intel_guc *guc, struct intel_context *ce) 
							   + 1));

		} else {

			--guc->submission_state.guc_ids_in_use;

			ida_simple_remove(&guc->submission_state.guc_ids,

			ida_free(&guc->submission_state.guc_ids,

				 ce->guc_id.id);

		}

		clr_ctx_id_mapping(guc, ce->guc_id.id);