On Wed, Oct 31, 2012 at 07:38:40PM +0200, ville.syrjala at linux.intel.com wrote: > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index cbc0035..83e16f8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2177,8 +2177,7 @@ intel_finish_fb(struct drm_framebuffer *old_fb) > int ret; > > wait_event(dev_priv->pending_flip_queue, > - atomic_read(&dev_priv->mm.wedged) || > - atomic_read(&obj->pending_flip) == 0); > + atomic_read(&dev_priv->mm.wedged)); And of course this bit is total nonsense now. I had the logic inverted in my mind. So this guy actually wants to stop waiting when the GPU hangs, not the other way around. So I need to drop the whole wait_event() here. Stand by for v2... -- Ville Syrj?l? Intel OTC
