[Intel-gfx] [PATCH 02/10] drm/i915: Decouple the stuck pageflip on modeset

[Daniel Vetter]

On Fri, Sep 05, 2014 at 08:31:20AM +0100, Chris Wilson wrote:
> On Fri, Sep 05, 2014 at 09:27:16AM +0200, Daniel Vetter wrote:
> > On Thu, Sep 04, 2014 at 08:15:32PM +0300, Ville Syrjälä wrote:
> > > On Tue, Sep 02, 2014 at 02:57:37PM +0100, Chris Wilson wrote:
> > > > If we successfully confuse the hardware, and cause it to drop a queued
> > > > pageflip, we wait for 60s and issue a warning before continuing on with
> > > > the modeset. However, this leaves the pending pageflip still stuck
> > > > indefinitely. Pretend to userspace that it does complete, and let us
> > > > start afresh following the modeset.
> > > > 
> > > > v2: Rebase after refactor
> > 
> > This applied cleanly despite that I don't have that refactor. Should I be
> > concerned?
> 
> No, the refactoring here was about the pageflip checking itself in patch
> 1. I just kept moving these two in lockstep.

Yeah, serious lack of coffee when I tried to apply this ;-)
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch