diff options
| author | Daniel Vetter | 2012-11-29 15:59:35 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-12-06 14:37:01 +0100 |
| commit | 2f0c2ad18b88691496e23d1ddbc2d0af8f6df5fa (patch) | |
| tree | 4ee03398f8dc094b4a4841bb164a204357e26f3b /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: WARN on !crtc in intel_dp_link_down (diff) | |
| download | kernel-qcow2-linux-2f0c2ad18b88691496e23d1ddbc2d0af8f6df5fa.tar.gz kernel-qcow2-linux-2f0c2ad18b88691496e23d1ddbc2d0af8f6df5fa.tar.xz kernel-qcow2-linux-2f0c2ad18b88691496e23d1ddbc2d0af8f6df5fa.zip | |
drm/i915: drop unnecessary clearing of pch dp transcoder timings
This has originally been added in
commit 8db9d77b1b14fd730561f64beea8c00e4478d7c5
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Wed Apr 7 16:15:54 2010 +0800
drm/i915: Support for Cougarpoint PCH display pipeline
probably to combat issues with hw state left behind by the BIOS. And
indeed, I've checked out that specific revision, and there is no DP
support yet. So the pch dp transcoder won't be correctly disabled, and
that's important since it requires a rether special disable dance:
Just writing 0 to TRANS_DP_CTL won't cut it, since we need to select
the NONE port when disabling, too.
And indeed, things seem to still work, so let's just remove this.
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f3e58a43886b..953796c84fbd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5345,15 +5345,8 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, } else intel_put_pch_pll(intel_crtc); - if (is_dp && !is_cpu_edp) { + if (is_dp && !is_cpu_edp) intel_dp_set_m_n(crtc, mode, adjusted_mode); - } else { - /* For non-DP output, clear any trans DP clock recovery setting.*/ - I915_WRITE(TRANSDATA_M1(pipe), 0); - I915_WRITE(TRANSDATA_N1(pipe), 0); - I915_WRITE(TRANSDPLINK_M1(pipe), 0); - I915_WRITE(TRANSDPLINK_N1(pipe), 0); - } for_each_encoder_on_crtc(dev, crtc, encoder) if (encoder->pre_pll_enable) |