From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 36/36] drm/i915: don't assert disabled FDI before disabling the FDI Date: Wed, 31 Oct 2012 18:12:55 -0200 Message-ID: <1351714375-15284-37-git-send-email-przanoni@gmail.com> References: <1351714375-15284-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ye0-f177.google.com (mail-ye0-f177.google.com [209.85.213.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BE3EA0BF7 for ; Wed, 31 Oct 2012 13:14:09 -0700 (PDT) Received: by mail-ye0-f177.google.com with SMTP id r1so354698yen.36 for ; Wed, 31 Oct 2012 13:14:09 -0700 (PDT) In-Reply-To: <1351714375-15284-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni On Haswell/LPT we must disable the PCH transcoder before we disable the FDI, so don't check for disabled FDI there. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c495bfa..310f2f2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1761,15 +1761,10 @@ static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv, DRM_ERROR("failed to disable transcoder %d\n", pipe); } -static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv, - enum transcoder cpu_transcoder) +static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv) { u32 val; - /* FDI relies on the transcoder */ - assert_fdi_tx_disabled(dev_priv, cpu_transcoder); - assert_fdi_rx_disabled(dev_priv, TRANSCODER_A); - val = I915_READ(_TRANSACONF); val &= ~TRANS_ENABLE; I915_WRITE(_TRANSACONF, val); @@ -3588,7 +3583,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) encoder->post_disable(encoder); if (is_pch_port) { - lpt_disable_pch_transcoder(dev_priv, cpu_transcoder); + lpt_disable_pch_transcoder(dev_priv); intel_ddi_fdi_disable(crtc); } -- 1.7.11.4