drm/i915/hdcp: Move aux assignment after connector type check

Move assignment of aux after connector type check as port may not
exist if connector is not DPMST.

--v2
-Fix unwanted change in intel_encoder check [Jani]

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240521081458.1500327-2-suraj.kandpal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 92b03073acdd563a7bea552bf795899d29abc10b..551c862ed7a6ae9fe98d0fafee4c1169b7235848 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -687,7 +687,7 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,
                                        bool *hdcp2_capable)
 {
        struct drm_i915_private *i915 = to_i915(connector->base.dev);
-       struct drm_dp_aux *aux = &connector->port->aux;
+       struct drm_dp_aux *aux;
        u8 bcaps;
        int ret;
 
@@ -696,6 +696,7 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,
        if (!intel_encoder_is_mst(connector->encoder))
                return -EINVAL;
 
+       aux = &connector->port->aux;
        ret =  _intel_dp_hdcp2_get_capability(aux, hdcp2_capable);
        if (ret)
                drm_dbg_kms(&i915->drm,