Re: [PATCH v1 5/5] drm/xe/pf: Split the provisioning mode change function

["Bernatowicz, Marcin" <marcin.bernatowicz@linux.intel.com>]

LGTM,

Reviewed-by: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>

On 10/27/2026 11:30 AM, Piórkowski, Piotr wrote:
> From: Michal Wajdeczko <michal.wajdeczko@intel.com>
>
> During VGPU profile provisioning we will need to change the
> provisioning mode while already holding the master mutex.
>
> Move the mode change logic into a static helper that expects the
> caller to hold the master mutex. The caller identity, used only in
> the debug message, is now passed explicitly, as the helper will be
> called from different places.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Signed-off-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
> ---
>   drivers/gpu/drm/xe/xe_sriov_pf_provision.c | 41 +++++++++++++---------
>   1 file changed, 24 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_sriov_pf_provision.c b/drivers/gpu/drm/xe/xe_sriov_pf_provision.c
> index 6ea2a24fef6e..7357b9369522 100644
> --- a/drivers/gpu/drm/xe/xe_sriov_pf_provision.c
> +++ b/drivers/gpu/drm/xe/xe_sriov_pf_provision.c
> @@ -154,6 +154,29 @@ int xe_sriov_pf_reprovision_default(struct xe_device *xe)
>   	return pf_reprovision_default(xe);
>   }
>   
> +static int pf_change_mode(struct xe_device *xe, enum xe_sriov_provisioning_mode mode, void *who)
> +{
> +	lockdep_assert_held(xe_sriov_pf_master_mutex(xe));
> +
> +	if (mode == xe->sriov.pf.provision.mode)
> +		return 0;
> +
> +	if (mode == XE_SRIOV_PROVISIONING_MODE_AUTO) {
> +		if (xe_sriov_pf_num_vfs(xe)) {
> +			xe_sriov_dbg(xe, "can't restore %s: VFs must be disabled!\n",
> +				     mode_to_string(mode));
> +			return -EBUSY;
> +		}
> +		pf_unprovision_all_vfs(xe);
> +	}
> +
> +	xe_sriov_dbg(xe, "mode %s changed to %s by %ps\n",
> +		     mode_to_string(xe->sriov.pf.provision.mode),
> +		     mode_to_string(mode), who);
> +	xe->sriov.pf.provision.mode = mode;
> +	return 0;
> +}
> +
>   /**
>    * xe_sriov_pf_provision_set_mode() - Change VFs provision mode.
>    * @xe: the PF &xe_device
> @@ -176,23 +199,7 @@ int xe_sriov_pf_provision_set_mode(struct xe_device *xe, enum xe_sriov_provision
>   
>   	guard(mutex)(xe_sriov_pf_master_mutex(xe));
>   
> -	if (mode == xe->sriov.pf.provision.mode)
> -		return 0;
> -
> -	if (mode == XE_SRIOV_PROVISIONING_MODE_AUTO) {
> -		if (xe_sriov_pf_num_vfs(xe)) {
> -			xe_sriov_dbg(xe, "can't restore %s: VFs must be disabled!\n",
> -				     mode_to_string(mode));
> -			return -EBUSY;
> -		}
> -		pf_unprovision_all_vfs(xe);
> -	}
> -
> -	xe_sriov_dbg(xe, "mode %s changed to %s by %ps\n",
> -		     mode_to_string(xe->sriov.pf.provision.mode),
> -		     mode_to_string(mode), __builtin_return_address(0));
> -	xe->sriov.pf.provision.mode = mode;
> -	return 0;
> +	return pf_change_mode(xe, mode, __builtin_return_address(0));
>   }
>   
>   /**