From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 2/4] drm/i915: don't disable fdi links
 harder in ilk_crtc_enable
Date: Thu, 13 Sep 2012 13:38:28 -0700
Message-ID: <20120913133828.5ed0c4ca@jbarnes-desktop>
References: <1346962115-7267-1-git-send-email-daniel.vetter@ffwll.ch>
	<1346962115-7267-3-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from oproxy6-pub.bluehost.com (oproxy6-pub.bluehost.com
	[67.222.54.6])
	by gabe.freedesktop.org (Postfix) with SMTP id 198C0A0F02
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 13 Sep 2012 13:38:14 -0700 (PDT)
In-Reply-To: <1346962115-7267-3-git-send-email-daniel.vetter@ffwll.ch>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=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: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Thu,  6 Sep 2012 22:08:33 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> 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 <daniel.vetter@ffwll.ch>
> ---
>  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 &&

Yep.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center