summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0250-drm-radeon-i915-Use-preempt_disable-enable_rt-where-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0250-drm-radeon-i915-Use-preempt_disable-enable_rt-where-.patch')
-rw-r--r--debian/patches-rt/0250-drm-radeon-i915-Use-preempt_disable-enable_rt-where-.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-rt/0250-drm-radeon-i915-Use-preempt_disable-enable_rt-where-.patch b/debian/patches-rt/0250-drm-radeon-i915-Use-preempt_disable-enable_rt-where-.patch
index c0e7434f2..5573efa34 100644
--- a/debian/patches-rt/0250-drm-radeon-i915-Use-preempt_disable-enable_rt-where-.patch
+++ b/debian/patches-rt/0250-drm-radeon-i915-Use-preempt_disable-enable_rt-where-.patch
@@ -1,9 +1,9 @@
-From 2c69acb6875156b092516fc81bd2a05b96973c2b Mon Sep 17 00:00:00 2001
+From b9f57823ffad3df30fb72183ff9a09346979fcf0 Mon Sep 17 00:00:00 2001
From: Mike Galbraith <umgwanakikbuti@gmail.com>
Date: Sat, 27 Feb 2016 08:09:11 +0100
Subject: [PATCH 250/323] drm,radeon,i915: Use preempt_disable/enable_rt()
where recommended
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
DRM folks identified the spots, so use them.
@@ -17,7 +17,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2 files changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 759f523c6a6b..7339a42ab2b8 100644
+index 759f523c6a6bf..7339a42ab2b80 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -847,6 +847,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc,
@@ -37,10 +37,10 @@ index 759f523c6a6b..7339a42ab2b8 100644
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 71bdafac9210..95ce311f434b 100644
+index 07d23a1e62a07..add8e60440b2b 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -1823,6 +1823,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+@@ -1828,6 +1828,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
struct radeon_device *rdev = dev->dev_private;
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
@@ -48,7 +48,7 @@ index 71bdafac9210..95ce311f434b 100644
/* Get optional system timestamp before query. */
if (stime)
-@@ -1915,6 +1916,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+@@ -1920,6 +1921,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
*etime = ktime_get();
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
@@ -57,5 +57,5 @@ index 71bdafac9210..95ce311f434b 100644
/* Decode into vertical and horizontal scanout position. */
*vpos = position & 0x1fff;
--
-2.43.0
+2.44.0