diff options
| author | Jani Nikula <[email protected]> | 2022-09-06 18:10:31 +0300 |
|---|---|---|
| committer | Jani Nikula <[email protected]> | 2022-09-06 18:25:30 +0300 |
| commit | 7fe194b2d1bdb9d17eabf1c5e485518a82c7aeab (patch) | |
| tree | a216362d88b2393b20c94f680e984147c66bc4c4 | |
| parent | 831a277ef0010e6599af6b300140ca61a97afff9 (diff) | |
Revert "drm/i915: Fix intel_dp_mst_compute_link_config"
This reverts commit c6266862de1665b8c8006f58612db2dea66a29f6.
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: Rodrigo Vivi <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index c61fd8b39c27..14d2a64193b2 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -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,21 +78,10 @@ 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) - break; - } + 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", slots); |