2020-04-21 20:13:52 +00:00
|
|
|
From fa2aaf043441bd422f017ee044eec3e113cc18b9 Mon Sep 17 00:00:00 2001
|
2018-08-27 14:32:32 +00:00
|
|
|
From: Mike Galbraith <umgwanakikbuti@gmail.com>
|
|
|
|
Date: Sat, 27 Feb 2016 08:09:11 +0100
|
2020-04-21 20:13:52 +00:00
|
|
|
Subject: [PATCH 252/325] drm,radeon,i915: Use preempt_disable/enable_rt()
|
2019-04-08 23:49:20 +00:00
|
|
|
where recommended
|
2020-04-21 20:13:52 +00:00
|
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.115-rt48.tar.xz
|
2018-08-27 14:32:32 +00:00
|
|
|
|
|
|
|
DRM folks identified the spots, so use them.
|
|
|
|
|
|
|
|
Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
|
|
|
|
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
Cc: linux-rt-users <linux-rt-users@vger.kernel.org>
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
---
|
2019-04-08 23:49:20 +00:00
|
|
|
drivers/gpu/drm/i915/i915_irq.c | 2 ++
|
|
|
|
drivers/gpu/drm/radeon/radeon_display.c | 2 ++
|
2018-08-27 14:32:32 +00:00
|
|
|
2 files changed, 4 insertions(+)
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
|
|
|
|
index 29877969310d..f65817c51c2a 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/drivers/gpu/drm/i915/i915_irq.c
|
|
|
|
+++ b/drivers/gpu/drm/i915/i915_irq.c
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -1025,6 +1025,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
|
2018-08-27 14:32:32 +00:00
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
|
|
|
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
|
|
|
|
+ preempt_disable_rt();
|
|
|
|
|
|
|
|
/* Get optional system timestamp before query. */
|
|
|
|
if (stime)
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -1076,6 +1077,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
|
2018-08-27 14:32:32 +00:00
|
|
|
*etime = ktime_get();
|
|
|
|
|
|
|
|
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
|
|
|
|
+ preempt_enable_rt();
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
|
2020-03-06 11:44:27 +00:00
|
|
|
index 7d1e14f0140a..bcc3456749d6 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/drivers/gpu/drm/radeon/radeon_display.c
|
|
|
|
+++ b/drivers/gpu/drm/radeon/radeon_display.c
|
2020-03-06 11:44:27 +00:00
|
|
|
@@ -1815,6 +1815,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
|
2018-08-27 14:32:32 +00:00
|
|
|
struct radeon_device *rdev = dev->dev_private;
|
|
|
|
|
|
|
|
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
|
|
|
|
+ preempt_disable_rt();
|
|
|
|
|
|
|
|
/* Get optional system timestamp before query. */
|
|
|
|
if (stime)
|
2020-03-06 11:44:27 +00:00
|
|
|
@@ -1907,6 +1908,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
|
2018-08-27 14:32:32 +00:00
|
|
|
*etime = ktime_get();
|
|
|
|
|
|
|
|
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
|
|
|
|
+ preempt_enable_rt();
|
|
|
|
|
|
|
|
/* Decode into vertical and horizontal scanout position. */
|
|
|
|
*vpos = position & 0x1fff;
|
2020-01-03 23:36:11 +00:00
|
|
|
--
|
2020-04-09 19:44:24 +00:00
|
|
|
2.25.1
|
2020-01-03 23:36:11 +00:00
|
|
|
|