From patchwork Thu Sep 6 20:08: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: 1417911 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 4EAA4DFFCF for ; Thu, 6 Sep 2012 21:17:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49B82A0D88 for ; Thu, 6 Sep 2012 14:17:38 -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 18429A0B35 for ; Thu, 6 Sep 2012 14:16:00 -0700 (PDT) Received: by wibhn17 with SMTP id hn17so1545645wib.12 for ; Thu, 06 Sep 2012 14:16:00 -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=kslgpyAbntpWO7ll96PRZWlFYxDDfTWJai9nxPIpmw4=; b=AgcboAq1s55WSmS+J98w1suQDF/7BZGF9KCsoahjP1Q7eLePpdhD56ADy+v1U78dhI A2+z+9Wu05q8Z3XKmHgg5Y9t7tD/sYL7arnFyE2shonfScqtQZJvui5dxEyct0wEhJut ksM+kYl+BvfydZF56xRGSLi1sTQtnwSZXyVpo= 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=kslgpyAbntpWO7ll96PRZWlFYxDDfTWJai9nxPIpmw4=; b=V9BICcPxHSY7lbxSRmKjLuFSiDbjIXyPfXIoVX9/Ghj+JWznAD2guT2QFJo2A/y4zh KRR5Glyiu/7YpEyOSPKvd+sTZJqOgPybfGitct4KPu7RSNkaIp4UxsO+NYwiVlttCXK9 ihqscOI/+3Fcon2JnnJ5zZwMDGPsUE6kbLVJCM3zIIGRcglzOSe7f/zUplSnpFYR6kzy FVxareURNZxZzg7fV3C5XnLdNIxXCe0WmmFqVRHKzkEHzYcvndfExzcksO9NAaRiLkw7 YKh4yMH52XOXPVlVTco5X9VsmRBMGb5lu3IknenQAASkmtaDZ6t+4BMkGV3T5CIH1uvy qYKA== Received: by 10.180.104.200 with SMTP id gg8mr7422674wib.14.1346966159966; Thu, 06 Sep 2012 14:15:59 -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 h9sm6038460wiz.1.2012.09.06.14.15.58 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 14:15:59 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 6 Sep 2012 22:08:33 +0200 Message-Id: <1346962115-7267-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1346962115-7267-1-git-send-email-daniel.vetter@ffwll.ch> References: <1346962115-7267-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmJvMiHQ8mti3Gnan5ea9blnBgmFl6mGRbXZGtLFXzPIZtA3mDX2z0xzKzksPV+A+Vc34x7 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/4] 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 Reviewed-by: Jesse Barnes --- 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 6c06109..0973797 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3182,10 +3182,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 &&