Re: [Intel-gfx] [PATCH] drm/i915: Remove nested work in gpu error handling

2015-02-03 Thread Mika Kuoppala
Chris Wilson writes: > On Mon, Feb 02, 2015 at 10:38:19AM +0100, Daniel Vetter wrote: >> On Mon, Feb 02, 2015 at 09:17:14AM +, Chris Wilson wrote: >> > On Wed, Jan 28, 2015 at 05:03:14PM +0200, Mika Kuoppala wrote: >> > > @@ -2616,6 +2612,9 @@ void i915_handle_error(struct drm_device *dev, >

Re: [Intel-gfx] [PATCH] drm/i915: Remove nested work in gpu error handling

2015-02-02 Thread Chris Wilson
On Mon, Feb 02, 2015 at 10:38:19AM +0100, Daniel Vetter wrote: > On Mon, Feb 02, 2015 at 09:17:14AM +, Chris Wilson wrote: > > On Wed, Jan 28, 2015 at 05:03:14PM +0200, Mika Kuoppala wrote: > > > @@ -2616,6 +2612,9 @@ void i915_handle_error(struct drm_device *dev, bool > > > wedged, > > > va

Re: [Intel-gfx] [PATCH] drm/i915: Remove nested work in gpu error handling

2015-02-02 Thread Daniel Vetter
On Mon, Feb 02, 2015 at 09:17:14AM +, Chris Wilson wrote: > On Wed, Jan 28, 2015 at 05:03:14PM +0200, Mika Kuoppala wrote: > > @@ -2616,6 +2612,9 @@ void i915_handle_error(struct drm_device *dev, bool > > wedged, > > va_list args; > > char error_msg[80]; > > > > + if (WARN_ON(mutex

Re: [Intel-gfx] [PATCH] drm/i915: Remove nested work in gpu error handling

2015-02-02 Thread Chris Wilson
On Wed, Jan 28, 2015 at 05:03:14PM +0200, Mika Kuoppala wrote: > @@ -2616,6 +2612,9 @@ void i915_handle_error(struct drm_device *dev, bool > wedged, > va_list args; > char error_msg[80]; > > + if (WARN_ON(mutex_is_locked(&dev_priv->dev->struct_mutex))) > + return; > +

Re: [Intel-gfx] [PATCH] drm/i915: Remove nested work in gpu error handling

2015-01-29 Thread Daniel Vetter
On Wed, Jan 28, 2015 at 03:30:35PM +, Chris Wilson wrote: > On Wed, Jan 28, 2015 at 05:03:14PM +0200, Mika Kuoppala wrote: > > Now when we declare gpu errors only through our own dedicated > > hangcheck workqueue there is no need to have a separate workqueue > > for handling the resetting and w

Re: [Intel-gfx] [PATCH] drm/i915: Remove nested work in gpu error handling

2015-01-28 Thread Chris Wilson
On Wed, Jan 28, 2015 at 05:03:14PM +0200, Mika Kuoppala wrote: > Now when we declare gpu errors only through our own dedicated > hangcheck workqueue there is no need to have a separate workqueue > for handling the resetting and waking up the clients as the deadlock > concerns are no more. > > The

[Intel-gfx] [PATCH] drm/i915: Remove nested work in gpu error handling

2015-01-28 Thread Mika Kuoppala
Now when we declare gpu errors only through our own dedicated hangcheck workqueue there is no need to have a separate workqueue for handling the resetting and waking up the clients as the deadlock concerns are no more. The only exception is i915_debugfs::i915_set_wedged, which triggers error handl