65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
From 97ccfd88d0c6abe6c94a4bef6322da580f960e5f Mon Sep 17 00:00:00 2001
|
|
Message-Id: <97ccfd88d0c6abe6c94a4bef6322da580f960e5f.1596234184.git.zanussi@kernel.org>
|
|
In-Reply-To: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
References: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
From: Mike Galbraith <umgwanakikbuti@gmail.com>
|
|
Date: Sat, 27 Feb 2016 08:09:11 +0100
|
|
Subject: [PATCH 251/329] drm,radeon,i915: Use preempt_disable/enable_rt()
|
|
where recommended
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.135-rt60.tar.xz
|
|
|
|
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>
|
|
---
|
|
drivers/gpu/drm/i915/i915_irq.c | 2 ++
|
|
drivers/gpu/drm/radeon/radeon_display.c | 2 ++
|
|
2 files changed, 4 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
|
|
index b7c398232136..eed1ba3009c6 100644
|
|
--- a/drivers/gpu/drm/i915/i915_irq.c
|
|
+++ b/drivers/gpu/drm/i915/i915_irq.c
|
|
@@ -1025,6 +1025,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
|
|
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)
|
|
@@ -1076,6 +1077,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
|
|
*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);
|
|
|
|
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
|
|
index 7d1e14f0140a..bcc3456749d6 100644
|
|
--- a/drivers/gpu/drm/radeon/radeon_display.c
|
|
+++ b/drivers/gpu/drm/radeon/radeon_display.c
|
|
@@ -1815,6 +1815,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. */
|
|
+ preempt_disable_rt();
|
|
|
|
/* Get optional system timestamp before query. */
|
|
if (stime)
|
|
@@ -1907,6 +1908,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. */
|
|
+ preempt_enable_rt();
|
|
|
|
/* Decode into vertical and horizontal scanout position. */
|
|
*vpos = position & 0x1fff;
|
|
--
|
|
2.17.1
|
|
|