diff options
| author | Dave Airlie <airlied@gmail.com> | 2014-07-19 16:48:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-07-19 16:48:38 +1000 |
| commit | e898c791e1a4c27fa1f221058b29b0ad06ddf8b0 (patch) | |
| tree | d22af30c9723939b602b1aef601ab9b8756f8091 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | b579fcca32b7eaef7c346dff55adc953b56bb1a8 (diff) | |
| parent | c6930992948adf0f8fc1f6ff1da51c5002a2cf95 (diff) | |
| download | blackbird-op-linux-e898c791e1a4c27fa1f221058b29b0ad06ddf8b0.tar.gz blackbird-op-linux-e898c791e1a4c27fa1f221058b29b0ad06ddf8b0.zip | |
Merge tag 'drm-intel-fixes-2014-07-18' of git://anongit.freedesktop.org/drm-intel
But in any case nothing really shocking in
here, 2 reverts, 1 quirk and a regression fix a WARN.
* tag 'drm-intel-fixes-2014-07-18' of git://anongit.freedesktop.org/drm-intel:
Revert "drm/i915: reverse dp link param selection, prefer fast over wide again"
drm/i915: Track the primary plane correctly when reassigning planes
drm/i915: Ignore VBT backlight presence check on HP Chromebook 14
Revert "drm/i915: Don't set the 8to6 dither flag when not scaling"
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 075170d1844f..8a1a4fbc06ac 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -906,8 +906,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, mode_rate = intel_dp_link_required(adjusted_mode->crtc_clock, bpp); - for (lane_count = min_lane_count; lane_count <= max_lane_count; lane_count <<= 1) { - for (clock = min_clock; clock <= max_clock; clock++) { + for (clock = min_clock; clock <= max_clock; clock++) { + for (lane_count = min_lane_count; lane_count <= max_lane_count; lane_count <<= 1) { link_clock = drm_dp_bw_code_to_link_rate(bws[clock]); link_avail = intel_dp_max_data_rate(link_clock, lane_count); |
