summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2012-10-31 18:12:40 -0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-11 23:51:19 +0100
commit0540e4882f221d5979e02e2a225ad077ae8b40b4 (patch)
tree026102ed1b6293561a9a0a5651cebfc37cb395ba /drivers/gpu/drm/i915/intel_display.c
parent7cbfd0653005d6c7a8f00d8ef5573b2976157780 (diff)
downloadblackbird-op-linux-0540e4882f221d5979e02e2a225ad077ae8b40b4.tar.gz
blackbird-op-linux-0540e4882f221d5979e02e2a225ad077ae8b40b4.zip
drm/i915: don't assert_panel_unlocked on LPT
There is no LVDS, so don't poke the LVDS registers. Signed-off-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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 88dd4c1a4c88..58614f81c096 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3183,8 +3183,7 @@ static void lpt_pch_enable(struct drm_crtc *crtc)
lpt_program_iclkip(crtc);
- /* set transcoder timing, panel must allow it */
- assert_panel_unlocked(dev_priv, pipe);
+ /* Set transcoder timing. */
I915_WRITE(TRANS_HTOTAL(pipe), I915_READ(HTOTAL(pipe)));
I915_WRITE(TRANS_HBLANK(pipe), I915_READ(HBLANK(pipe)));
I915_WRITE(TRANS_HSYNC(pipe), I915_READ(HSYNC(pipe)));
OpenPOWER on IntegriCloud