Commit 7fe194b2 authored by Jani Nikula's avatar Jani Nikula
Browse files

Revert "drm/i915: Fix intel_dp_mst_compute_link_config" 



This reverts commit c6266862.

Part of a series where patches were modified while applying to resolve
conflicts, leading to further conflicts between drm-misc-next and
drm-intel-next, resulting in build failures in drm-tip. To be applied
again on a baseline with drm-misc-next and drm-intel-next in sync.

Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 831a277e

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

+2 −14
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, 
		&crtc_state->hw.adjusted_mode;

	bool constant_n = drm_dp_has_quirk(&intel_dp->desc, DP_DPCD_QUIRK_CONSTANT_N);

	int bpp, slots = -EINVAL;

	int ret = 0;



	crtc_state->lane_count = limits->max_lane_count;

	crtc_state->port_clock = limits->max_rate;
@@ -79,20 +78,9 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, 
									       crtc_state->lane_count));

		if (slots == -EDEADLK)

			return slots;

		if (slots >= 0) {

			ret = drm_dp_mst_atomic_check(state);

			/*

			 * If we got slots >= 0 and we can fit those based on check

			 * then we can exit the loop. Otherwise keep trying.

			 */

			if (!ret)

		if (slots >= 0)

			break;

	}

	}



	/* Despite slots are non-zero, we still failed the atomic check */

	if (ret && slots >= 0)

		slots = ret;



	if (slots < 0) {

		drm_dbg_kms(&i915->drm, "failed finding vcpi slots:%d\n",