Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241014075601.2324382-8-himal.prasad.ghimiray@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Himal Prasad Ghimiray and committed by
Rodrigo Vivi
82d9de63 3b41f888

+4 -2
+4 -2
drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
··· 41 41 struct xe_gt *gt = tile->media_gt; 42 42 struct xe_gsc *gsc = &gt->uc.gsc; 43 43 bool ret = true; 44 + unsigned int fw_ref; 44 45 45 46 if (!gsc && !xe_uc_fw_is_enabled(&gsc->fw)) { 46 47 drm_dbg_kms(&xe->drm, ··· 50 49 } 51 50 52 51 xe_pm_runtime_get(xe); 53 - if (xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC)) { 52 + fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC); 53 + if (!fw_ref) { 54 54 drm_dbg_kms(&xe->drm, 55 55 "failed to get forcewake to check proxy status\n"); 56 56 ret = false; ··· 61 59 if (!xe_gsc_proxy_init_done(gsc)) 62 60 ret = false; 63 61 64 - xe_force_wake_put(gt_to_fw(gt), XE_FW_GSC); 62 + xe_force_wake_put(gt_to_fw(gt), fw_ref); 65 63 out: 66 64 xe_pm_runtime_put(xe); 67 65 return ret;