Unverified Commit 82d9de63 authored by Himal Prasad Ghimiray's avatar Himal Prasad Ghimiray Committed by Rodrigo Vivi
Browse files

drm/xe/hdcp: Update handling of xe_force_wake_get return 



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@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241014075601.2324382-8-himal.prasad.ghimiray@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 3b41f888

drivers/gpu/drm/xe/display/xe_hdcp_gsc.c

+4 −2
Original line number Diff line number Diff line
@@ -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;