61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
|
From d6b4b732c0fbd3757edd078f6f937ec9a54d48d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mike Galbraith <umgwanakikbuti@gmail.com>
|
||
|
|
Date: Sat, 27 Feb 2016 08:09:11 +0100
|
||
|
|
Subject: [PATCH 314/365] drm,radeon,i915: Use preempt_disable/enable_rt()
|
||
|
|
where recommended
|
||
|
|
|
||
|
|
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 685247c3d489..df3eefde21fa 100644
|
||
|
|
--- a/drivers/gpu/drm/i915/i915_irq.c
|
||
|
|
+++ b/drivers/gpu/drm/i915/i915_irq.c
|
||
|
|
@@ -812,6 +812,7 @@ static int 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)
|
||
|
|
@@ -863,6 +864,7 @@ static int 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 99e23800cadc..dc74c535d5c6 100644
|
||
|
|
--- a/drivers/gpu/drm/radeon/radeon_display.c
|
||
|
|
+++ b/drivers/gpu/drm/radeon/radeon_display.c
|
||
|
|
@@ -1855,6 +1855,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)
|
||
|
|
@@ -1947,6 +1948,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.28.0
|
||
|
|
|