From: Sasha Levin Date: Fri, 23 Nov 2018 19:05:17 +0000 (-0500) Subject: Revert "Revert "drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES"" X-Git-Tag: v3.18.127~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=987bd96e818355c4e57e08c92976f4fd41c6902a;p=profile%2Fwearable%2Fplatform%2Fkernel%2Flinux-3.18-exynos7270.git Revert "Revert "drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES"" This reverts commit bc07ee33284ac6e6872d5efad1b321ec0b7b46a4. Which is upstream commit a50940510e94f5fb65ffd79877a60592d85598a9. This revert relies on upstream commit a63b03e2d24 ("mutex: Always clear owner field upon mutex_unlock()") being in the tree, but that commit should not be backported. Signed-off-by: Sasha Levin --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d0f0a79..d88dbed 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -5144,7 +5144,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 */