From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 2/2] drm/i915: fixup load-detect on enabled,
 but not active pipe
Date: Sun, 22 Apr 2012 11:17:48 +0200
Message-ID: <20120422091748.GC4723@phenom.ffwll.local>
References: <1334948616-16073-1-git-send-email-daniel.vetter@ffwll.ch>
	<1334948616-16073-2-git-send-email-daniel.vetter@ffwll.ch>
	<1334951122_7754@CP5-2952>
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 mail-we0-f177.google.com (mail-we0-f177.google.com
	[74.125.82.177])
	by gabe.freedesktop.org (Postfix) with ESMTP id 1F49B9E771
	for <intel-gfx@lists.freedesktop.org>;
	Sun, 22 Apr 2012 02:16:50 -0700 (PDT)
Received: by werp11 with SMTP id p11so8478832wer.36
	for <intel-gfx@lists.freedesktop.org>;
	Sun, 22 Apr 2012 02:16:49 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1334951122_7754@CP5-2952>
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: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Fri, Apr 20, 2012 at 08:44:59PM +0100, Chris Wilson wrote:
> On Fri, 20 Apr 2012 21:03:36 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > Somehow we have a fast-path that tries to avoid going through
> > the load-detect code when the encode already has a crtc associated.
> > But this fails horribly when the crtc is off. The load detect pipe
> > itself manages this case well (and also does not forget to restore the
> > dpms state), so just rip out this special case.
> > 
> > The issue seems to go back all the way to the commit that originally
> > introduced load-detection on the vga output:
> > 
> > commit e4a5d54f924ea5ce2913d9d0687d034004816465
> > Author: Ma Ling <ling.ma@intel.com>
> > Date:   Tue May 26 11:31:00 2009 +0800
> > 
> >     drm/i915: Add support for VGA load detection (pre-945).
> > 
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43020
> > Reported-by: Jean Delvare <khali@linux-fr.org>
> > Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> I'm happy that intel_get_load_detect_pipe() does the right thing if the
> connector is already active (so that we don't blank an active display
> when checking for disconnections). I was worried that this meant we had
> a deeper bug with our connection state, but as Daniel made me realise it
> is that the "fast path" is lacking the enable.
> 
> For this and subsuquent TV fix, begone foul code,
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

I've picked up this one for -fixes ant the other two for -next, thanks for
the review.
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48