On Sun, May 18, 2014 at 08:13:38PM +0100, Chris Wilson wrote: > On Sun, May 18, 2014 at 09:08:40PM +0200, Thomas Meyer wrote: > > Am Montag, den 12.05.2014, 07:33 +0100 schrieb Chris Wilson: > > > On Sun, May 11, 2014 at 07:40:57PM +0200, Daniel Vetter wrote: > > > > On Sun, May 11, 2014 at 11:02 AM, Dave Airlie <airlied@xxxxxxxxx> wrote: > > > > > On 11 May 2014 18:28, Thomas Meyer <thomas@xxxxxxxx> wrote: > > > > >> Hi, > > > > >> > > > > >> 3.14.3 works as expected. > > > > >> 3.15-rc5 shows a strange behaviour: When resuming from ram the X server > > > > >> seems to be disfunctional. > > > > >> > > > > >> I see this WARNING in the kernel log before suspend to ram in the early > > > > >> boot process: > > > > > > > > Doesn't ring a bell really. > > > > > > Same symptoms as > > > https://bugs.freedesktop.org/show_bug.cgi?id=76554 > > > -Chris > > > > > > > bisected this to: > > # first bad commit: [78f2975eec9faff353a6194e854d3d39907bab68] drm/i915: Move all ring resets before setting the HWS page > > > > commit 78f2975eec9faff353a6194e854d3d39907bab68 > > Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > Date: Wed Apr 2 16:36:07 2014 +0100 > > > > drm/i915: Move all ring resets before setting the HWS page > > > > In commit a51435a3137ad8ae75c288c39bd2d8b2696bae8f > > Author: Naresh Kumar Kachhi <naresh.kumar.kachhi@xxxxxxxxx> > > Date: Wed Mar 12 16:39:40 2014 +0530 > > > > drm/i915: disable rings before HW status page setup > > > > we reordered stopping the rings to do so before we set the HWS register. > > However, there is an extra workaround for g45 to reset the rings twice, > > and for consistency we should apply that workaround before setting the > > HWS to be sure that the rings are truly stopped. > > > > Reference: http://lkml.kernel.org/r/20140423202248.GA3621@xxxxxxxxxxxxxxxx > > Tested-by: Pavel Machek <pavel@xxxxxx> > > Cc: Naresh Kumar Kachhi <naresh.kumar.kachhi@xxxxxxxxx> > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > Reviewed-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > > > Reverting above commit from current linus' master tree makes the display server behave correctly after resume from ram. > > Boot time regression trumps resume regression? Doubly-so as we have an > earlier resume regression with identical symptoms? I'll check on my gm45 - that has has become much more crashy ime in 3.15 somehow, with ring init failures. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
