drm/i915/dp: Remove eDP special cases from bandwidth checks

These were just working around the math being wrong.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index ffe98ad9b6401a0d1360e6c9fc7ae3eacc655ebd..813939420cb4cb25b210c3c36111f833b49eb759 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -236,11 +236,8 @@ intel_dp_mode_valid(struct drm_connector *connector,
                        return MODE_PANEL;
        }
 
-       /* only refuse the mode on non eDP since we have seen some weird eDP panels
-          which are outside spec tolerances but somehow work by magic */
-       if (!is_edp(intel_dp) &&
-           (intel_dp_link_required(intel_dp, mode->clock)
-            > intel_dp_max_data_rate(max_link_clock, max_lanes)))
+       if (intel_dp_link_required(intel_dp, mode->clock)
+           > intel_dp_max_data_rate(max_link_clock, max_lanes))
                return MODE_CLOCK_HIGH;
 
        if (mode->clock < 10000)
@@ -700,19 +697,6 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
                }
        }
 
-       if (is_edp(intel_dp)) {
-               /* okay we failed just pick the highest */
-               intel_dp->lane_count = max_lane_count;
-               intel_dp->link_bw = bws[max_clock];
-               adjusted_mode->clock = intel_dp_link_clock(intel_dp->link_bw);
-               DRM_DEBUG_KMS("Force picking display port link bw %02x lane "
-                             "count %d clock %d\n",
-                             intel_dp->link_bw, intel_dp->lane_count,
-                             adjusted_mode->clock);
-
-               return true;
-       }
-
        return false;
 }