Re: [RFC PATCH 1/4] drm/xe/xe_late_bind_fw: Refactor pm flow

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Thu, Mar 05, 2026 at 04:14:42PM +0530, Badal Nilawar wrote:
> Refactor late binding flow across suspend/resume by adding dedicated
> pm functions.
> 
> Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_late_bind_fw.c | 32 +++++++++++++++++++++-------
>  drivers/gpu/drm/xe/xe_late_bind_fw.h |  4 ++--
>  drivers/gpu/drm/xe/xe_pm.c           |  6 +++---
>  3 files changed, 29 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_late_bind_fw.c b/drivers/gpu/drm/xe/xe_late_bind_fw.c
> index 768442ca7da6d..5ca25186dc0cc 100644
> --- a/drivers/gpu/drm/xe/xe_late_bind_fw.c
> +++ b/drivers/gpu/drm/xe/xe_late_bind_fw.c
> @@ -193,7 +193,7 @@ static int xe_late_bind_fw_num_fans(struct xe_late_bind *late_bind, u32 *num_fan
>  			     PCODE_MBOX(FAN_SPEED_CONTROL, FSC_READ_NUM_FANS, 0), num_fans, NULL);
>  }
>  
> -void xe_late_bind_wait_for_worker_completion(struct xe_late_bind *late_bind)
> +static void xe_late_bind_wait_for_worker_completion(struct xe_late_bind *late_bind)

since it is now static, you can perhaps remove entirely the
prefix 'xe_late_bind_' to make it shorter.

I prefer without it but I don't believe it hurts to keep it. Up to you:

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

>  {
>  	struct xe_device *xe = late_bind_to_xe(late_bind);
>  	struct xe_late_bind_fw *lbfw;
> @@ -269,18 +269,12 @@ static void xe_late_bind_work(struct work_struct *work)
>  	xe_pm_runtime_put(xe);
>  }
>  
> -int xe_late_bind_fw_load(struct xe_late_bind *late_bind)
> +static int xe_late_bind_fw_load(struct xe_late_bind *late_bind)
>  {
>  	struct xe_device *xe = late_bind_to_xe(late_bind);
>  	struct xe_late_bind_fw *lbfw;
>  	int fw_id;
>  
> -	if (!late_bind->component_added)
> -		return -ENODEV;
> -
> -	if (late_bind->disable)
> -		return 0;
> -
>  	for (fw_id = 0; fw_id < XE_LB_FW_MAX_ID; fw_id++) {
>  		lbfw = &late_bind->late_bind_fw[fw_id];
>  		if (lbfw->payload) {
> @@ -424,6 +418,28 @@ static void xe_late_bind_remove(void *arg)
>  	}
>  }
>  
> +void xe_late_bind_pm_suspend(struct xe_late_bind *late_bind)
> +{
> +	if (!late_bind->component_added)
> +		return;
> +
> +	if (late_bind->disable)
> +		return;
> +
> +	xe_late_bind_wait_for_worker_completion(late_bind);
> +}
> +
> +void xe_late_bind_pm_resume(struct xe_late_bind *late_bind)
> +{
> +	if (!late_bind->component_added)
> +		return;
> +
> +	if (late_bind->disable)
> +		return;
> +
> +	xe_late_bind_fw_load(late_bind);
> +}
> +
>  /**
>   * xe_late_bind_init() - add xe mei late binding component
>   * @late_bind: pointer to late bind structure.
> diff --git a/drivers/gpu/drm/xe/xe_late_bind_fw.h b/drivers/gpu/drm/xe/xe_late_bind_fw.h
> index 07e4373905395..8896fea3068e5 100644
> --- a/drivers/gpu/drm/xe/xe_late_bind_fw.h
> +++ b/drivers/gpu/drm/xe/xe_late_bind_fw.h
> @@ -11,7 +11,7 @@
>  struct xe_late_bind;
>  
>  int xe_late_bind_init(struct xe_late_bind *late_bind);
> -int xe_late_bind_fw_load(struct xe_late_bind *late_bind);
> -void xe_late_bind_wait_for_worker_completion(struct xe_late_bind *late_bind);
> +void xe_late_bind_pm_suspend(struct xe_late_bind *late_bind);
> +void xe_late_bind_pm_resume(struct xe_late_bind *late_bind);
>  
>  #endif
> diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
> index 01185f10a8835..f85b12c1a85d2 100644
> --- a/drivers/gpu/drm/xe/xe_pm.c
> +++ b/drivers/gpu/drm/xe/xe_pm.c
> @@ -182,7 +182,7 @@ int xe_pm_suspend(struct xe_device *xe)
>  	if (err)
>  		goto err;
>  
> -	xe_late_bind_wait_for_worker_completion(&xe->late_bind);
> +	xe_late_bind_pm_suspend(&xe->late_bind);
>  
>  	for_each_gt(gt, xe, id)
>  		xe_gt_suspend_prepare(gt);
> @@ -284,7 +284,7 @@ int xe_pm_resume(struct xe_device *xe)
>  	if (IS_VF_CCS_READY(xe))
>  		xe_sriov_vf_ccs_register_context(xe);
>  
> -	xe_late_bind_fw_load(&xe->late_bind);
> +	xe_late_bind_pm_resume(&xe->late_bind);
>  
>  	drm_dbg(&xe->drm, "Device resumed\n");
>  	xe_pm_block_end_signalling();
> @@ -698,7 +698,7 @@ int xe_pm_runtime_resume(struct xe_device *xe)
>  		xe_sriov_vf_ccs_register_context(xe);
>  
>  	if (xe->d3cold.allowed)
> -		xe_late_bind_fw_load(&xe->late_bind);
> +		xe_late_bind_pm_resume(&xe->late_bind);
>  
>  out:
>  	xe_rpm_lockmap_release(xe);
> -- 
> 2.52.0
>