On Mon, Jan 26, 2015 at 04:43:22AM -0800, Rodrigo Vivi wrote: > From: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > The core fix was applied in > > commit a63b03e2d2477586440741677ecac45bcf28d7b1 > Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Date: Tue Jan 6 10:29:35 2015 +0000 > > mutex: Always clear owner field upon mutex_unlock() > > (note the absence of stable@ tag) > > so we can now revert our band-aid commit 226e5ae9e5f910 for -next. > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> > Cc: Jani Nikula <jani.nikula@xxxxxxxxx> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_gem.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 0a074bc..b50a2b4 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -5213,7 +5213,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task) > if (!mutex_is_locked(mutex)) > return false; > > -#if defined(CONFIG_SMP) && !defined(CONFIG_DEBUG_MUTEXES) > +#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES) > return mutex->owner == task; > #else > /* Since UP may be pre-empted, we cannot assume that we own the lock */ > -- > 1.9.3 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
