diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-08-22 12:07:14 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-08-22 13:05:03 -0400 |
| commit | 30a610580c0f579c92906f0d7c846f1d9682b129 (patch) | |
| tree | b099e2d5f8fd40d508f3f0a32a8a155ddbeac973 | |
| parent | 37dfea85b9b2a0bb234a46e4459524d3f42aee3f (diff) | |
| download | 4.8-rt-patches-30a610580c0f579c92906f0d7c846f1d9682b129.tar.gz | |
refresh i915 for vanilla 4.6
| -rw-r--r-- | patches/gpu-i915-don-t-open-code-these-things.patch (renamed from patches/i915_compile_fix.patch) | 17 | ||||
| -rw-r--r-- | patches/series | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/patches/i915_compile_fix.patch b/patches/gpu-i915-don-t-open-code-these-things.patch index 05f39cdeae6b6..6168d4a3f0863 100644 --- a/patches/i915_compile_fix.patch +++ b/patches/gpu-i915-don-t-open-code-these-things.patch @@ -1,23 +1,26 @@ +From 2a145b0176ee00e9f5807b6b25ad76172567b189 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Tue, 14 Jul 2015 14:26:34 +0200 -Subject: gpu/i915: don't open code these things +Subject: [PATCH] gpu/i915: don't open code these things 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_shrinker.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c +index d3c473ffb90a..6d543e2b2e6d 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c -@@ -39,7 +39,7 @@ static bool mutex_is_locked_by(struct mu +@@ -39,7 +39,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task) if (!mutex_is_locked(mutex)) return false; --#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER) -+#if (defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)) && !defined(CONFIG_PREEMPT_RT_BASE) +-#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 */ +-- +2.5.0 + diff --git a/patches/series b/patches/series index e071b8854ad18..a070858dc73b8 100644 --- a/patches/series +++ b/patches/series @@ -349,7 +349,7 @@ kernel-rtmutex-only-warn-once-on-a-try-lock-from-bad.patch # RAID5 md-raid5-percpu-handling-rt-aware.patch # -i915_compile_fix.patch +gpu-i915-don-t-open-code-these-things.patch # FUTEX/RTMUTEX rtmutex-futex-prepare-rt.patch |