Re: [Intel-gfx] [PATCH] drm/i915: don't check inconsistent modeset state when force-restoring

From: Richard Cochran <richardcochran@gmail.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	DRI Development <dri-devel@lists.freedesktop.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Dave Airlie <airlied@gmail.com>, Tomas Melin <tomas.melin@iki.fi>,
	Chris Wilson <chris@chris-wilson.co.uk>,
	stable <stable@vger.kernel.org>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: don't check inconsistent modeset state when force-restoring
Date: Thu, 11 Apr 2013 20:37:27 +0200	[thread overview]
Message-ID: <20130411183727.GA2649@netboy> (raw)
In-Reply-To: <CAKMK7uFVpnbxT-P+eEoFjKPJ1bEom7Q_PhNcr1ZnzApkc8mqug@mail.gmail.com>

On Thu, Apr 11, 2013 at 08:14:10PM +0200, Daniel Vetter wrote:
> 
> I've just tracked down and fixed an bug which can lead to a hard-hang
> in the crtc restore code (which is used both in the lid handler when
> opening and on resume). If you could please test this patch (on top of
> drm-intel-nightly):
> 
> https://patchwork.kernel.org/patch/2428971/

Okay, will do.

> >> I'll quickly port the patch (in it's latest v3 version) to 3.9-rc
> >> kernels for you to test.

FWIW, this does work, no freeze, no warning, but instead:

Apr 11 20:30:49 netboy laptop-mode: Laptop mode 
Apr 11 20:30:49 netboy laptop-mode: enabled, 
Apr 11 20:30:49 netboy laptop-mode: not active [unchanged]
Apr 11 20:30:53 netboy kernel: [   75.450783] [drm:i9xx_crtc_mode_set] *ERROR* Couldn't find PLL settings for mode!
Apr 11 20:30:53 netboy laptop-mode: Laptop mode 
Apr 11 20:30:53 netboy laptop-mode: enabled, 
Apr 11 20:30:53 netboy laptop-mode: not active [unchanged]

Thanks,
Richard