diff options
author | Adam Jackson <ajax@redhat.com> | 2011-10-14 12:43:50 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-10-21 02:22:00 -0400 |
commit | dc22ee6fc18ce0f15424e753e8473c306ece95c1 (patch) | |
tree | 050c55546742f0b9b98e68a5b42f48e0381daae5 /drivers/gpu | |
parent | cd9dde44f47501394b9f0715b6a36a92aa74c0d0 (diff) |
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ffe98ad9b640..813939420cb4 100644 --- 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, | |||
236 | return MODE_PANEL; | 236 | return MODE_PANEL; |
237 | } | 237 | } |
238 | 238 | ||
239 | /* only refuse the mode on non eDP since we have seen some weird eDP panels | 239 | if (intel_dp_link_required(intel_dp, mode->clock) |
240 | which are outside spec tolerances but somehow work by magic */ | 240 | > intel_dp_max_data_rate(max_link_clock, max_lanes)) |
241 | if (!is_edp(intel_dp) && | ||
242 | (intel_dp_link_required(intel_dp, mode->clock) | ||
243 | > intel_dp_max_data_rate(max_link_clock, max_lanes))) | ||
244 | return MODE_CLOCK_HIGH; | 241 | return MODE_CLOCK_HIGH; |
245 | 242 | ||
246 | if (mode->clock < 10000) | 243 | if (mode->clock < 10000) |
@@ -700,19 +697,6 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode, | |||
700 | } | 697 | } |
701 | } | 698 | } |
702 | 699 | ||
703 | if (is_edp(intel_dp)) { | ||
704 | /* okay we failed just pick the highest */ | ||
705 | intel_dp->lane_count = max_lane_count; | ||
706 | intel_dp->link_bw = bws[max_clock]; | ||
707 | adjusted_mode->clock = intel_dp_link_clock(intel_dp->link_bw); | ||
708 | DRM_DEBUG_KMS("Force picking display port link bw %02x lane " | ||
709 | "count %d clock %d\n", | ||
710 | intel_dp->link_bw, intel_dp->lane_count, | ||
711 | adjusted_mode->clock); | ||
712 | |||
713 | return true; | ||
714 | } | ||
715 | |||
716 | return false; | 700 | return false; |
717 | } | 701 | } |
718 | 702 | ||