[FOR CI 7/8] With disabled irqs instead

[Maarten Lankhorst <dev@lankhorst.se>]

Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
---
 drivers/gpu/drm/i915/display/intel_crtc.c   | 14 +++++---------
 drivers/gpu/drm/i915/display/intel_cursor.c | 18 ++++++------------
 drivers/gpu/drm/i915/display/intel_vblank.c |  8 ++++++--
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index 678264c9b82f2..832287b2f95a7 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -570,12 +570,10 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
 	 */
 	intel_psr_wait_for_idle_locked(new_crtc_state);
 
+#ifdef I915
 	if (!IS_ENABLED(CONFIG_PREEMPT_RT))
-		local_irq_disable();
-#ifndef I915
-	else
-		preempt_disable();
 #endif
+		local_irq_disable();
 
 	crtc->debug.min_vbl = evade.min;
 	crtc->debug.max_vbl = evade.max;
@@ -593,12 +591,10 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
 	return;
 
 irq_disable:
+#ifdef I915
 	if (!IS_ENABLED(CONFIG_PREEMPT_RT))
-		local_irq_disable();
-#ifndef I915
-	else
-		preempt_disable();
 #endif
+		local_irq_disable();
 
 }
 
@@ -699,7 +695,7 @@ void intel_pipe_update_end(struct intel_atomic_state *state,
 		icl_dsi_frame_update(new_crtc_state);
 
 #if !defined(I915) && IS_ENABLED(CONFIG_PREEMPT_RT)
-	preempt_enable();
+	local_irq_enable();
 #endif
 
 	/* We're still in the vblank-evade critical section, this can't race.
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index 50ca39eb09145..6dbaeeb6084b2 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -920,23 +920,19 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
 		 */
 		intel_psr_wait_for_idle_locked(crtc_state);
 
+#ifdef I915
 		if (!IS_ENABLED(CONFIG_PREEMPT_RT))
-			local_irq_disable();
-#ifndef I915
-		else
-			preempt_disable();
 #endif
+			local_irq_disable();
 
 		intel_vblank_evade(&evade);
 
 		vblanked = true;
 	} else {
+#ifdef I915
 		if (!IS_ENABLED(CONFIG_PREEMPT_RT))
-			local_irq_disable();
-#ifndef I915
-		else
-			preempt_disable();
 #endif
+			local_irq_disable();
 	}
 
 	if (new_plane_state->uapi.visible) {
@@ -946,12 +942,10 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
 		intel_plane_disable_arm(NULL, plane, crtc_state);
 	}
 
+#ifdef I915
 	if (!IS_ENABLED(CONFIG_PREEMPT_RT))
-		local_irq_enable();
-#ifndef I915
-	else
-		preempt_enable();
 #endif
+		local_irq_enable();
 
 	intel_psr_unlock(crtc_state);
 
diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
index 5fcf5c08187f7..e7450d4d99d25 100644
--- a/drivers/gpu/drm/i915/display/intel_vblank.c
+++ b/drivers/gpu/drm/i915/display/intel_vblank.c
@@ -386,7 +386,9 @@ static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc,
 	 */
 	intel_vblank_section_enter_irqf(display, &irqflags);
 
-	if (IS_ENABLED(CONFIG_PREEMPT_RT))
+#ifdef I915
+	if (!IS_ENABLED(CONFIG_PREEMPT_RT))
+#endif
 		preempt_disable();
 
 	/* Get optional system timestamp before query. */
@@ -451,7 +453,9 @@ static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc,
 	if (etime)
 		*etime = ktime_get();
 
-	if (IS_ENABLED(CONFIG_PREEMPT_RT))
+#ifdef I915
+	if (!IS_ENABLED(CONFIG_PREEMPT_RT))
+#endif
 		preempt_enable();
 
 	intel_vblank_section_exit_irqf(display, irqflags);
-- 
2.51.0