Wei Yongjun, On Fri, Dec 05, 2014 at 08:55:59AM +0800, weiyj_lk@xxxxxxx wrote: > From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> > > Add the missing unlock before return from function i915_gem_init_hw() > in the error handling case. > > Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_gem.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index d2ba315..3eeb2d0 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4879,8 +4879,10 @@ i915_gem_init_hw(struct drm_device *dev) > i915_gem_init_swizzling(dev); > > ret = dev_priv->gt.init_rings(dev); > - if (ret) > + if (ret) { > + mutex_unlock(&dev->struct_mutex); > return ret; > + } > There are other places in i915_gem_init_hw() where it returns without unlocking the mutex. Why is it only necessary here and not any of the other places? > for (i = 0; i < NUM_L3_SLICES(dev); i++) > i915_gem_l3_remap(&dev_priv->ring[RCS], i); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- - Jeremiah Mahler _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx