24 lines
925 B
Diff
24 lines
925 B
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Subject: gpu/i915: don't open code these things
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/patches-3.10.10-rt7.tar.xz
|
|
|
|
The opencode part is gone in 1f83fee0 ("drm/i915: clear up wedged transitions")
|
|
the owner check is still there.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
drivers/gpu/drm/i915/i915_gem.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/i915/i915_gem.c
|
|
+++ b/drivers/gpu/drm/i915/i915_gem.c
|
|
@@ -4449,7 +4449,7 @@ static bool mutex_is_locked_by(struct mu
|
|
if (!mutex_is_locked(mutex))
|
|
return false;
|
|
|
|
-#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
|
|
+#if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)) && !defined(CONFIG_PREEMPT_RT_BASE)
|
|
return mutex->owner == task;
|
|
#else
|
|
/* Since UP may be pre-empted, we cannot assume that we own the lock */
|