[PATCH 1/2] drm/i915/hdcp: Move aux assignment after connector type check

[Suraj Kandpal]

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.kand...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c 
b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 92b03073acdd..551c862ed7a6 100644
--- 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,
-- 
2.43.2