From patchwork Wed Jul 11 14:28:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1184291 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 8B100DF25A for ; Wed, 11 Jul 2012 16:31:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7AF40A0EF3 for ; Wed, 11 Jul 2012 09:31:45 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 10B76A0E4F for ; Wed, 11 Jul 2012 08:36:51 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so946955wgb.12 for ; Wed, 11 Jul 2012 08:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=shLWAIp/mGytMvC6TInCg9/X9HXj3zVIqD6dVJ310f8=; b=E7IHWfXtlSeegkCNUYz9t8t2xn9KoCNvtwbxiP+rALrEYKc9bYmDgnV66ibktto/PG Ec8HzFmPXRP3SciUGpOevrdp8bMQsul7eKcYfX5iYlurxHaiQn5rr4e3Ltv2EmsHiEZk MWj5GSYtj6gPWzG2VWh4MkWhWZHDVwM338zDk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=shLWAIp/mGytMvC6TInCg9/X9HXj3zVIqD6dVJ310f8=; b=COqd+fF9tgLLx/bPEmEyfA3DBoVuI1WB9yz326bHn7o8GEvMm56d/W8plSrc+GozIj sleIX/hNPeSk8eQM3sDBcTSgAdIBY8b6Dipd3ddkvufCLgK/A8Ox4vYmzYLXhPeMQB7z ttTWXmSKoCFA7GD09+XA3aZSBEw8WyVxDAxQTKjS2ayYP/bg5aWLan0z6IM9/ZfpU4/k lHPQBxB1coi05NhJrywQR5A1Se0II4IDCAaJwKGtuy7BFmfxNSmuALyXK7Bhe0fCW9op ZP1creMuJFgAj0X2/Y+bUA5Wrjgg9N+qbPnNWwW4evaoBCJiNl8+P8r/Fs4SVBQfPr8A /A6A== Received: by 10.217.1.8 with SMTP id m8mr5303978wes.118.1342021011865; Wed, 11 Jul 2012 08:36:51 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id bc2sm5777080wib.0.2012.07.11.08.36.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:36:51 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:57 +0200 Message-Id: <1342016944-23395-75-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQkRJFUsBoFHBh8VPT7gJEJIv474/ENrwKkk1d42VYWogaFZnMzyJiYSPX4Xr69d2GnDp50N Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 74/81] drm/i915: don't disable fdi links harder in ilk_crtc_enable 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 Because they should have been disabled when shutting down the display pipe previously. To ensure that this is the case, add a few assserts instead of unconditionally disabling the fdi link. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 38a73bf..03133e4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3179,10 +3179,12 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) is_pch_port = intel_crtc_driving_pch(crtc); - if (is_pch_port) + if (is_pch_port) { ironlake_fdi_pll_enable(intel_crtc); - else - ironlake_fdi_disable(crtc); + } else { + assert_fdi_tx_disabled(dev_priv, pipe); + assert_fdi_rx_disabled(dev_priv, pipe); + } /* Enable panel fitting for LVDS */ if (dev_priv->pch_pf_size &&