drm/i915/hdcp: Move checks for gsc health status

Move checks for gsc components required for HDCP 2.2
to work into intel_hdcp_gsc.c. This will also help
with XE refactor on HDCP's side.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231009095537.653619-2-suraj.kandpal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 8cca4793cf92d415148a48d576daa744bfcaaba5..c89da3568ebdb3812cdbb527be9bc85aadea2f11 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -173,14 +173,8 @@ bool intel_hdcp2_capable(struct intel_connector *connector)
 
        /* If MTL+ make sure gsc is loaded and proxy is setup */
        if (intel_hdcp_gsc_cs_required(i915)) {
-               struct intel_gt *gt = i915->media_gt;
-               struct intel_gsc_uc *gsc = gt ? &gt->uc.gsc : NULL;
-
-               if (!gsc || !intel_uc_fw_is_running(&gsc->fw)) {
-                       drm_dbg_kms(&i915->drm,
-                                   "GSC components required for HDCP2.2 are not ready\n");
+               if (!intel_hdcp_gsc_check_status(i915))
                        return false;
-               }
        }
 
        /* MEI/GSC interface is solid depending on which is used */

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
index d753db3eef155c728d3d99acd1fb0049633dd129..d355d610bc9fc4f6f91bf861254206c9aee0d63a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
@@ -17,6 +17,20 @@ bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915)
        return DISPLAY_VER(i915) >= 14;
 }
 
+bool intel_hdcp_gsc_check_status(struct drm_i915_private *i915)
+{
+       struct intel_gt *gt = i915->media_gt;
+       struct intel_gsc_uc *gsc = gt ? &gt->uc.gsc : NULL;
+
+       if (!gsc || !intel_uc_fw_is_running(&gsc->fw)) {
+               drm_dbg_kms(&i915->drm,
+                           "GSC components required for HDCP2.2 are not ready\n");
+               return false;
+       }
+
+       return true;
+}
+
 static int
 gsc_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
                          struct hdcp2_ake_init *ake_data)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
index cbf96551e534f8e9ebeee3bab44e2b1f5bcdbbc3..eba2057c5a9e6f1bca0d3b752390af8be9fe87e2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
@@ -23,5 +23,6 @@ ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
                                size_t msg_out_len);
 int intel_hdcp_gsc_init(struct drm_i915_private *i915);
 void intel_hdcp_gsc_fini(struct drm_i915_private *i915);
+bool intel_hdcp_gsc_check_status(struct drm_i915_private *i915);
 
 #endif /* __INTEL_HDCP_GCS_H__ */