[PATCH v9 13/26] drm/xe/mocs: Update handling of xe_force_wake_get return

[Nirmoy Das]

On 10/14/2024 9:55 AM, Himal Prasad Ghimiray wrote:
> xe_force_wake_get() now returns the reference count-incremented domain
> mask. If it fails for individual domains, the return value will always
> be 0. However, for XE_FORCEWAKE_ALL, it may return a non-zero value even
> in the event of failure. Update the return handling of xe_force_wake_get()
> to reflect this behavior, and ensure that the return value is passed as
> input to xe_force_wake_put().
>
> v3
> - return xe_wakeref_t instead of int in xe_force_wake_get()
> - don't use xe_assert() to report HW errors (Michal)
>
> v5
> - return unsigned int from xe_force_wake_get()
> - Remove redundant warn
>
> v7
> - Fix commit message
>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
Reviewed-by: Nirmoy Das <Nirmoy.das at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_mocs.c | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_mocs.c b/drivers/gpu/drm/xe/xe_mocs.c
> index 231d0e86ed83..54d199b5cfb2 100644
> --- a/drivers/gpu/drm/xe/xe_mocs.c
> +++ b/drivers/gpu/drm/xe/xe_mocs.c
> @@ -774,25 +774,21 @@ void xe_mocs_init(struct xe_gt *gt)
>  
>  void xe_mocs_dump(struct xe_gt *gt, struct drm_printer *p)
>  {
> -	struct xe_mocs_info table;
> -	unsigned int flags;
> -	u32 ret;
>  	struct xe_device *xe = gt_to_xe(gt);
> +	struct xe_mocs_info table;
> +	unsigned int fw_ref, flags;
>  
>  	flags = get_mocs_settings(xe, &table);
>  
>  	xe_pm_runtime_get_noresume(xe);
> -	ret = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
> -
> -	if (ret)
> +	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
> +	if (!fw_ref)
>  		goto err_fw;
>  
>  	table.ops->dump(&table, flags, gt, p);
>  
> -	xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
> -
> +	xe_force_wake_put(gt_to_fw(gt), fw_ref);
>  err_fw:
> -	xe_assert(xe, !ret);
>  	xe_pm_runtime_put(xe);
>  }
>