[PATCH v9 22/26] drm/xe/query: Update handling of xe_force_wake_get return

[Nilawar, Badal]

On 14-10-2024 13:25, Himal Prasad Ghimiray wrote:
> With xe_force_wake_get() now returning the refcount-incremented
> domain mask, a non-zero return value in the case of XE_FORCEWAKE_ALL
> does not necessarily indicate success. Use xe_force_wake_ref_has_domain()
> to determine the status of the call.
> 
> Modify the return handling of xe_force_wake_get() accordingly and
> pass the return value to xe_force_wake_put().
> 
> v3
> - return xe_wakeref_t instead of int in xe_force_wake_get()
> - xe_force_wake_put() error doesn't need to be checked. It internally
> WARNS on domain ack failure.
> 
> v5
> - return unsigned int from xe_force_wake_get()
> 
> v6
> - Use helper Use xe_force_wake_ref_has_domain()
> 
> 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>
> ---
>   drivers/gpu/drm/xe/xe_query.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
> index 5093a243e9fe..dcd1291da057 100644
> --- a/drivers/gpu/drm/xe/xe_query.c
> +++ b/drivers/gpu/drm/xe/xe_query.c
> @@ -117,6 +117,7 @@ query_engine_cycles(struct xe_device *xe,
>   	__ktime_func_t cpu_clock;
>   	struct xe_hw_engine *hwe;
>   	struct xe_gt *gt;
> +	unsigned int fw_ref;
>   
>   	if (query->size == 0) {
>   		query->size = size;
> @@ -149,13 +150,16 @@ query_engine_cycles(struct xe_device *xe,
>   	if (!hwe)
>   		return -EINVAL;
>   
> -	if (xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL))
> +	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
> +	if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL))  {
> +		xe_force_wake_put(gt_to_fw(gt), fw_ref);
>   		return -EIO;
> +	}
>   
>   	hwe_read_timestamp(hwe, &resp.engine_cycles, &resp.cpu_timestamp,
>   			   &resp.cpu_delta, cpu_clock);
>   
> -	xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
> +	xe_force_wake_put(gt_to_fw(gt), fw_ref);

Reviewed-by: Badal Nilawar <badal.nilawar at intel.com>

Regards,
Badal

>   
>   	if (GRAPHICS_VER(xe) >= 20)
>   		resp.width = 64;