From patchwork Thu Jul 26 18:49:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1245421 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 64826DFFCE for ; Thu, 26 Jul 2012 20:53:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 291C8A0EEC for ; Thu, 26 Jul 2012 13:53:18 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id E5A079F5AF for ; Thu, 26 Jul 2012 12:57:40 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hm11so1801934wib.12 for ; Thu, 26 Jul 2012 12:57:40 -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=5L1/a/FOuGGP6DgH8uS/i7U3379QNVqXPSdIl/AesGo=; b=gRGPEFEwykFa9/VtSNA84GcXQDN8Zl3cZzUFRZ+uX0+Ki9cbp6ehIXqoPQdeVnNgn2 HCpDly4n/WBU1AneRg1LORSPrQEGgeDIJm/MUHp9AcjDEwk+//lceadbrzy3OWVj5i1e wkBIytbo7ZMaaM9+y4l+fodpZVsLb0TDCJwL0= 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=5L1/a/FOuGGP6DgH8uS/i7U3379QNVqXPSdIl/AesGo=; b=B4IbodqbEdN26Wkac4nv6phQ9IYNwUlXPYWWnBPYiviCMRwlGbGZ+Nc/jgOFDtLdQf vKZ2AheHldNM11uUqcubLMCPq6K2UK9c0p6fNiYlstFoE7DoUyzyn9JrzwbZRpp94N9B lX4UMxjzecaae9VEofq6cbma3fYfax2rI6HVH1aiepxsM3mFih1O7fI1Ott11mDeZPOv /CMA+hZFgjFwjzGXS0MCkO2oewd2gQDBx+Ln6yA1SZ24C6VYaoAvp6/xMMIkqP6dTYI2 hvlvO7veg6bzaquE97mkaUnqtt5Fcvog78MN1tGXgco7AE7+QLyvFdedkV4rWza5RAZr 4Wmg== Received: by 10.216.233.216 with SMTP id p66mr1946507weq.152.1343332660593; Thu, 26 Jul 2012 12:57:40 -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 fr4sm391403wib.8.2012.07.26.12.57.39 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:57:39 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:49:33 +0200 Message-Id: <1343328581-2324-69-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQndhteTPNCw3Z218plpshyJe0hShG/YjWKpmZJs+3AX9ka3mAuSI8LxmpZ6YbZMAI66O8UU Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 68/76] 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 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index cc21302..09c1a1c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3181,10 +3181,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 &&