[PATCH v2 04/23] drm/xe/hdcp: Update handling of xe_force_wake_get return

[Kandpal, Suraj]

> -----Original Message-----
> From: Ghimiray, Himal Prasad <himal.prasad.ghimiray at intel.com>
> Sent: Friday, September 13, 2024 12:46 AM
> To: intel-xe at lists.freedesktop.org
> Cc: Ghimiray, Himal Prasad <himal.prasad.ghimiray at intel.com>; Kandpal,
> Suraj <suraj.kandpal at intel.com>; Ceraolo Spurio, Daniele
> <daniele.ceraolospurio at intel.com>; Vivi, Rodrigo <rodrigo.vivi at intel.com>;
> De Marchi, Lucas <lucas.demarchi at intel.com>
> Subject: [PATCH v2 04/23] drm/xe/hdcp: Update handling of
> xe_force_wake_get return
> 
> With xe_force_wake_get() now returning the refcount-incremented domain
> mask, the return value will be 0 for single domains (excluding
> XE_FORCEWAKE_ALL) in the event of a failure. Modify the return handling
> of xe_force_wake_get() accordingly and pass the return value as input to
> xe_force_wake_put().

LGTM,
Reviewed-by: Suraj Kandpal <suraj.kandpal at intel.com>
> 
> Cc: Suraj Kandpal <suraj.kandpal at intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio 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>
> ---
>  drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> index 6619a40aed15..1db8a5c62f60 100644
> --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> @@ -41,6 +41,7 @@ bool intel_hdcp_gsc_check_status(struct xe_device *xe)
>  	struct xe_gt *gt = tile->media_gt;
>  	struct xe_gsc *gsc = &gt->uc.gsc;
>  	bool ret = true;
> +	int fw_ref;
> 
>  	if (!gsc && !xe_uc_fw_is_enabled(&gsc->fw)) {
>  		drm_dbg_kms(&xe->drm,
> @@ -49,7 +50,8 @@ bool intel_hdcp_gsc_check_status(struct xe_device *xe)
>  	}
> 
>  	xe_pm_runtime_get(xe);
> -	if (xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC)) {
> +	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC);
> +	if (!fw_ref) {
>  		drm_dbg_kms(&xe->drm,
>  			    "failed to get forcewake to check proxy status\n");
>  		ret = false;
> @@ -59,7 +61,7 @@ bool intel_hdcp_gsc_check_status(struct xe_device *xe)
>  	if (!xe_gsc_proxy_init_done(gsc))
>  		ret = false;
> 
> -	xe_force_wake_put(gt_to_fw(gt), XE_FW_GSC);
> +	xe_force_wake_put(gt_to_fw(gt), fw_ref);
>  out:
>  	xe_pm_runtime_put(xe);
>  	return ret;
> --
> 2.34.1