summaryrefslogtreecommitdiff
path: root/patches/drm-i915-init-spinlock-properly-on-RT.patch
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2017-10-17 17:13:28 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2017-10-17 17:13:28 +0200
commit4aca7bf0252fb2fd2017ac18d3997776162a99c0 (patch)
treece0b44cfbff890448774f7878e962870f354bd7c /patches/drm-i915-init-spinlock-properly-on-RT.patch
parent163c99cd5cc3ffff6f0ac886236223e72ae989fb (diff)
downloadlinux-rt-db58c74ffbc7fb1c568c9155abe39ccf16c4b9d2.tar.gz
[ANNOUNCE] v4.13.7-rt1v4.13.7-rt1-patches
Dear RT folks! I'm pleased to announce the v4.13.7-rt1 patch set. Changes since v4.11.12-rt16: - Rebase to v4.13.7 - We have now only the reader bias version of RWLOCK. In v4.11 it was possible to choose between both implementations but since the reader bias version makes no problems it is now the only implementation. - The lockdep self test is now disabled. While it produced some false positives on v4.11 it now completly locks up the system and needs investigation before re-enabling. Known issues None You can get this release via the git tree at: git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git v4.13.7-rt1 The RT patch against v4.13.7 can be found here: https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.13/older/patch-4.13.7-rt1.patch.xz The split quilt queue is available at: https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.13/older/patches-4.13.7-rt1.tar.xz Sebastian Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'patches/drm-i915-init-spinlock-properly-on-RT.patch')
-rw-r--r--patches/drm-i915-init-spinlock-properly-on-RT.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/drm-i915-init-spinlock-properly-on-RT.patch b/patches/drm-i915-init-spinlock-properly-on-RT.patch
index a0fbb615dd78..11cda8f82c9c 100644
--- a/patches/drm-i915-init-spinlock-properly-on-RT.patch
+++ b/patches/drm-i915-init-spinlock-properly-on-RT.patch
@@ -11,16 +11,16 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
--- a/drivers/gpu/drm/i915/i915_gem_timeline.c
+++ b/drivers/gpu/drm/i915/i915_gem_timeline.c
-@@ -50,7 +50,12 @@ static int __i915_gem_timeline_init(stru
- tl->fence_context = fences++;
- tl->common = timeline;
+@@ -34,7 +34,12 @@ static void __intel_timeline_init(struct
+ tl->fence_context = context;
+ tl->common = parent;
#ifdef CONFIG_DEBUG_SPINLOCK
+# ifdef CONFIG_PREEMPT_RT_FULL
-+ rt_mutex_init(&tl->lock.lock);
-+ __rt_spin_lock_init(&tl->lock, lockname, lockclass);
++ rt_mutex_init(&tl->lock.lock);
++ __rt_spin_lock_init(&tl->lock, lockname, lockclass);
+# else
- __raw_spin_lock_init(&tl->lock.rlock, lockname, lockclass);
+ __raw_spin_lock_init(&tl->lock.rlock, lockname, lockclass);
+# endif
#else
- spin_lock_init(&tl->lock);
+ spin_lock_init(&tl->lock);
#endif