Re: [2.6.36-rc2 regression] X201s: resume-from-S2R hangs

[Andy Isaacson <adi@hexapodia.org>]

On Tue, Sep 07, 2010 at 06:37:55PM +0100, Chris Wilson wrote:
> On Tue, 07 Sep 2010 10:12:34 -0700, Eric Anholt <eric@anholt.net> wrote:
> > On Mon, 6 Sep 2010 02:05:36 -0700, Andy Isaacson <adi@hexapodia.org> wrote:
> > > I have a Thinkpad X201s on which suspend-to-RAM was quite reliable until
> > > after 2.6.36-rc1; with problematic kernels, suspend seems to work OK
> > > (the machine goes to sleep with the moon LED steadily lit) but on resume
> > > the LCD never lights up (and it's not just the backlight, the screen
> > > isn't drawing at all) and the keyboard and network are dead.  Nothing
> > > makes it to syslog, either.  The moon LED is turned off though.
> > > 
> > > There seems to be some timing component to the problem -- some problem
> > > kernels will suspend reliably 25% or 50% of the time and hang the rest.
> > > There also seems to be some per-reboot state involved; one problem
> > > kernel suspended successfully and survived 25 suspends in a row without
> > > triggering a failure.  (But after a reboot, the first suspend hung...)
> > > Other problem kernels fail on 4 out of 4 reboots.
>
> At the moment we have a second resume regression that has been difficult to
> reproduce, https://bugs.freedesktop.org/show_bug.cgi?id=29406 :
> 
> commit d1b851fc0d105caa6b6e3e7c92d2987dfb52cbe0
> Author: Zou Nan hai <nanhai.zou@intel.com>
> Date:   Fri May 21 09:08:57 2010 +0800
> 
>     drm/i915: implement BSD ring buffer V2
> 
> The workaround for this is to #define HAS_BSD(dev) 0 [i915_drv.h].

Setting HAS_BSD 0 does not fix the issue for me.

@@ -1203,7 +1203,7
...
-#define HAS_BSD(dev)            (IS_IRONLAKE(dev) || IS_G4X(dev))
+#define HAS_BSD(dev)            0

As previously reported, reverting ce171780 does seem to do the trick
(I'm a bit more confident having survived another day of use).

> We introduced a timing regression which should be fixed by 
> http://cgit.freedesktop.org/~ickle/drm-intel/ drm-intel-fixes
> [http://cgit.freedesktop.org/~ickle/drm-intel/commit/?id=300387c0b57d75e5218e2881d6ad2720657a8bcf]

Currently building d56557 which includes 300387, will let you know if
that fixes it.

-andy