From 0e7ec97519448489a01af4a87453e1e6671aba8f Mon Sep 17 00:00:00 2001 From: Michal Wajdeczko Date: Wed, 16 Sep 2026 23:29:49 +0200 Subject: [PATCH] drm/xe/pf: Move locking to xe_sriov_pf_reprovision_default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should avoid taking the mutex in the helpers. Move guard from the helper to the main entry function. Signed-off-by: Michal Wajdeczko Reviewed-by: Piotr Piórkowski Link: https://patch.msgid.link/20260916212949.13120-1-michal.wajdeczko@intel.com --- drivers/gpu/drm/xe/xe_sriov_pf_provision.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_sriov_pf_provision.c b/drivers/gpu/drm/xe/xe_sriov_pf_provision.c index 0ec7ea83f12a..c37e422b5a5c 100644 --- a/drivers/gpu/drm/xe/xe_sriov_pf_provision.c +++ b/drivers/gpu/drm/xe/xe_sriov_pf_provision.c @@ -112,7 +112,7 @@ static int pf_reprovision_default(struct xe_device *xe) int result = 0; int err; - guard(mutex)(xe_sriov_pf_master_mutex(xe)); + lockdep_assert_held(xe_sriov_pf_master_mutex(xe)); for_each_gt(gt, xe, id) { err = xe_gt_sriov_pf_policy_set_sched_if_idle_locked(gt, false); @@ -138,6 +138,8 @@ int xe_sriov_pf_reprovision_default(struct xe_device *xe) { xe_assert(xe, IS_SRIOV_PF(xe)); + guard(mutex)(xe_sriov_pf_master_mutex(xe)); + if (!pf_auto_provisioning_mode(xe)) return 0;