From: Paulo Zanoni Date: Wed, 31 Oct 2012 20:12:40 +0000 (-0200) Subject: drm/i915: don't assert_panel_unlocked on LPT X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0540e4882f221d5979e02e2a225ad077ae8b40b4;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 88dd4c1a4c8..58614f81c09 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)));