Commit 019899b5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-03-06' of... 

Merge tag 'drm-intel-fixes-2025-03-06' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- DP MST fix (Jani)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z8ng8NjmRGiVcb5t@intel.com
parents ac3a75bd d1039a3c

drivers/gpu/drm/i915/display/intel_dp_mst.c

+2 −1
Original line number Diff line number Diff line
@@ -1867,7 +1867,8 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id) 
	/* create encoders */

	mst_stream_encoders_create(dig_port);

	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, display->drm,

					   &intel_dp->aux, 16, 3, conn_base_id);

					   &intel_dp->aux, 16,

					   INTEL_NUM_PIPES(display), conn_base_id);

	if (ret) {

		intel_dp->mst_mgr.cbs = NULL;

		return ret;