From patchwork Wed Oct 31 20:12:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1681641 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 5687CDFB80 for ; Wed, 31 Oct 2012 20:33:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1723EA0B29 for ; Wed, 31 Oct 2012 13:33:57 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=hADnLvtxJ+YMIzcSBBWZ6t078E9NfHhM9XJemlLqTs4=; b=uZzCZl1xiiicNyqkuIwM84HvkrzoHkWjI2OXh04sAjtUi2tbvk9EgwOlVsgKiPj9yr 9SUWUuJecwfr/Lix4HBMoW10D/SvcJ/db3ZiGudONHoDf53PvPq60kn7kc3Up08Kg8ab 1JRxYAvLgHHAap+eZueTrlA/4CpljKH1MmqecAVqW8h3BR5lBUFnZP+P3P0GJh5WTpP9 xotoOlwUPYdZQS5egSvje+5OzVxLlQJk2eeX8xQP0xcz2mZ/KsJElm6j8tLZAwWNi1t+ m6+a6KPbxdJ1U/S2b3y6bLfiUODr1ERWKQ0OSOSrg65xNHHnNjC4NrbZXodKjWLcSKqQ mQaA== Received: by 10.236.144.137 with SMTP id n9mr37369599yhj.107.1351714449187; Wed, 31 Oct 2012 13:14:09 -0700 (PDT) Received: from vicky.domain.invalid ([177.42.7.91]) by mx.google.com with ESMTPS id h16sm4354130ani.0.2012.10.31.13.14.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 13:14:08 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 31 Oct 2012 18:12:55 -0200 Message-Id: <1351714375-15284-37-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351714375-15284-1-git-send-email-przanoni@gmail.com> References: <1351714375-15284-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 36/36] drm/i915: don't assert disabled FDI before disabling the FDI X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@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); }