Re: [Intel-gfx] [PATCH] drm/i915: Fix context/engine cleanup order

2015-12-15 Thread Dave Gordon
On 14/12/15 22:17, Chris Wilson wrote: On Mon, Dec 14, 2015 at 05:13:43PM +, Chris Wilson wrote: On Mon, Dec 14, 2015 at 04:30:04PM +, Nick Hoath wrote: diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 900ffd0..7df3c7a 100644 --- a/dr

Re: [Intel-gfx] [PATCH] drm/i915: Fix context/engine cleanup order

2015-12-14 Thread Chris Wilson
On Mon, Dec 14, 2015 at 05:13:43PM +, Chris Wilson wrote: > On Mon, Dec 14, 2015 at 04:30:04PM +, Nick Hoath wrote: > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c > > b/drivers/gpu/drm/i915/i915_gem_context.c > > index 900ffd0..7df3c7a 100644 > > --- a/drivers/gpu/drm/i915/i915_g

Re: [Intel-gfx] [PATCH] drm/i915: Fix context/engine cleanup order

2015-12-14 Thread Chris Wilson
On Mon, Dec 14, 2015 at 04:30:04PM +, Nick Hoath wrote: > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c > b/drivers/gpu/drm/i915/i915_gem_context.c > index 900ffd0..7df3c7a 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -431,1

[Intel-gfx] [PATCH] drm/i915: Fix context/engine cleanup order

2015-12-14 Thread Nick Hoath
Swap the order of context & engine cleanup, so that it is now contexts, then engines. This allows the context clean up code to do things like confirm that ring->dev->struct_mutex is locked without a NULL pointer dereference. This came about as a result of the 'intel_ring_initialized() must be simpl

Re: [Intel-gfx] [PATCH] drm/i915: Fix context/engine cleanup order

2015-12-11 Thread Chris Wilson
On Fri, Dec 11, 2015 at 02:36:36PM +, Nick Hoath wrote: > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 84e2b20..a2857b0 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -449,7 +449,7 @@ static int i915_load_mod

[Intel-gfx] [PATCH] drm/i915: Fix context/engine cleanup order

2015-12-11 Thread Nick Hoath
Swap the order of context & engine cleanup, so that it is now contexts, then engines. This allows the context clean up code to do things like confirm that ring->dev->struct_mutex is locked without a NULL pointer dereference. This came about as a result of the 'intel_ring_initialized() must be simpl