From: Maarten Lankhorst <dev@lankhorst.se>
To: intel-xe@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [i915-rt v2 09/16] drm/i915/display: Enable interrupts earlier on PREEMPT_RT
Date: Tue, 16 Dec 2025 10:22:36 +0100 [thread overview]
Message-ID: <20251216092226.1777909-27-dev@lankhorst.se> (raw)
In-Reply-To: <20251216092226.1777909-18-dev@lankhorst.se>
The last part of the vblank evasion is about updating bookkeeping,
not programming hardware registers.
The interrupts cannot stay disabled here on PREEMPT_RT since the
spinlocks get converted to mutexes.
There's still a small race in VRR that needs to be addressed, and
in the other worst case there is a delay of a vblank completion if
the vblank is fired and we schedule on the next vblank, this needs
to be addressed separately.
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
---
drivers/gpu/drm/i915/display/intel_crtc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index cb31c9c1c2525..84ab737c50918 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -703,6 +703,14 @@ void intel_pipe_update_end(struct intel_atomic_state *state,
intel_crtc_has_type(new_crtc_state, INTEL_OUTPUT_DSI))
icl_dsi_frame_update(new_crtc_state);
+#if IS_ENABLED(CONFIG_PREEMPT_RT)
+ /*
+ * Timing sensitive register writing completed, non-deterministic
+ * locking from here on out.
+ */
+ local_irq_enable();
+#endif
+
/* We're still in the vblank-evade critical section, this can't race.
* Would be slightly nice to just grab the vblank count and arm the
* event outside of the critical section - the spinlock might spin for a
@@ -750,7 +758,9 @@ void intel_pipe_update_end(struct intel_atomic_state *state,
if (!state->base.legacy_cursor_update)
intel_vrr_send_push(NULL, new_crtc_state);
+#if !IS_ENABLED(CONFIG_PREEMPT_RT)
local_irq_enable();
+#endif
if (intel_parent_vgpu_active(display))
goto out;
--
2.51.0
next prev parent reply other threads:[~2025-12-16 9:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-16 9:22 [i915-rt v2 00/16] drm/i915/display: All patches to make PREEMPT_RT work on i915 + xe Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 01/16] drm/i915/display: Fix intel_lpe_audio_irq_handler for PREEMPT-RT Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 02/16] drm/i915/display: Make get_vblank_counter use intel_de_read_fw() Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 03/16] drm/i915/display: Use intel_de_write_fw in intel_pipe_fastset Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 04/16] drm/i915/display: Make set_pipeconf use the fw variants Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 05/16] drm/i915/display: Move vblank put until after critical section Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 06/16] drm/i915/display: Remove locking from intel_vblank_evade " Maarten Lankhorst
2025-12-16 20:15 ` [i915-rt v2.1] " Maarten Lankhorst
2025-12-22 18:14 ` [i915-rt v2 06/16] " kernel test robot
2025-12-16 9:22 ` [i915-rt v2 07/16] drm/i915/display: Handle vlv dsi workaround in scanline_in_safe_range too Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 08/16] drm/i915/display: Make icl_dsi_frame_update use _fw too Maarten Lankhorst
2025-12-16 9:22 ` Maarten Lankhorst [this message]
2025-12-16 9:22 ` [i915-rt v2 10/16] drm/i915: Use preempt_disable/enable_rt() where recommended Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 11/16] PREEMPT_RT injection Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 12/16] drm/i915/display: Use intel_de_read_fw in colorops Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 13/16] drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock() Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 14/16] drm/i915: Drop the irqs_disabled() check Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 15/16] drm/i915/guc: Consider also RCU depth in busy loop Maarten Lankhorst
2025-12-16 9:22 ` [i915-rt v2 16/16] Revert "drm/i915: Depend on !PREEMPT_RT." Maarten Lankhorst
2025-12-16 11:35 ` ✗ Fi.CI.BUILD: failure for drm/i915/display: All patches to make PREEMPT_RT work on i915 + xe. (rev2) Patchwork
2025-12-16 20:54 ` ✗ Fi.CI.BUILD: warning for drm/i915/display: All patches to make PREEMPT_RT work on i915 + xe. (rev3) Patchwork
2025-12-16 20:55 ` ✗ Fi.CI.DOCS: " Patchwork
2025-12-16 21:27 ` ✗ i915.CI.BAT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251216092226.1777909-27-dev@lankhorst.se \
--to=dev@lankhorst.se \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox