[PATCH v9 07/26] drm/xe/hdcp: 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()
>
> v5
> - return unsigned int for xe_force_wake_get()
>
> v7
> - Fix commit message
>
> 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>
> Reviewed-by: Suraj Kandpal <suraj.kandpal at intel.com>(#rev2)
Reviewed-by: Nirmoy Das <nirmoy.das 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..3567f474b6cb 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;
> +	unsigned 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;