From: Jouni Högander Date: Fri, 6 Sep 2024 07:00:30 +0000 (+0300) Subject: drm/i915/display: Handle MST connector in intel_attached_dp X-Git-Tag: v6.13-rc1~122^2~19^2~188 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12f01766537a44104b1a43bfa5b16fccadad4aeb;p=thirdparty%2Fkernel%2Flinux.git drm/i915/display: Handle MST connector in intel_attached_dp Connector->encoder might be null for MST connector. Take this into account in intel_attached_dp. Signed-off-by: Jouni Högander Reviewed-by: Imre Deak Link: https://patchwork.freedesktop.org/patch/msgid/20240906070033.289015-2-jouni.hogander@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 733de5edcfdb3..000ab373c8879 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1913,7 +1913,10 @@ static inline struct intel_dp *enc_to_intel_dp(struct intel_encoder *encoder) static inline struct intel_dp *intel_attached_dp(struct intel_connector *connector) { - return enc_to_intel_dp(intel_attached_encoder(connector)); + if (connector->mst_port) + return connector->mst_port; + else + return enc_to_intel_dp(intel_attached_encoder(connector)); } static inline bool intel_encoder_is_dp(struct intel_encoder *encoder)