Re: [Intel-gfx] [PATCH] drm/i915/hdcp: Check if media_gt exists

[Nautiyal, Ankit K]

I think we can add fixes tag:

Fixes: 883631771038 ("drm/i915/mtl: Add HDCP GSC interface")

with relevant folks in CC.

Otherwise, LGTM.

Reviewed-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>

On 5/3/2023 3:42 PM, Suraj Kandpal wrote:

Check if media_gt exists if we are using gsc cs

--v2
-correct typo [Ankit]
-assign gsc variable if gt exists [Ankit]

--v3
-declare gsc and gt variables in if block [Ankit]

Cc: Ankit Nautiyal <ankit.k.nauti...@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kand...@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.so...@intel.com>
---
  drivers/gpu/drm/i915/display/intel_hdcp.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c 
b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 650232c4892b..b183efab04a1 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -204,8 +204,6 @@ bool intel_hdcp2_capable(struct intel_connector *connector)
        struct intel_digital_port *dig_port = 
intel_attached_dig_port(connector);
        struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
        struct intel_hdcp *hdcp = &connector->hdcp;
-       struct intel_gt *gt = dev_priv->media_gt;
-       struct intel_gsc_uc *gsc = &gt->uc.gsc;
        bool capable = false;

/* I915 support for HDCP2.2 */

@@ -213,9 +211,13 @@ bool intel_hdcp2_capable(struct intel_connector *connector)
                return false;

/* If MTL+ make sure gsc is loaded and proxy is setup */

-       if (intel_hdcp_gsc_cs_required(dev_priv))
-               if (!intel_uc_fw_is_running(&gsc->fw))
+       if (intel_hdcp_gsc_cs_required(dev_priv)) {
+               struct intel_gt *gt = dev_priv->media_gt;
+               struct intel_gsc_uc *gsc = gt ? &gt->uc.gsc : NULL;
+
+               if (!gsc || !intel_uc_fw_is_running(&gsc->fw))
                        return false;
+       }

/* MEI/GSC interface is solid depending on which is used */

        mutex_lock(&dev_priv->display.hdcp.comp_mutex);