Skip to content

drm/i915/display: All patches to make PREEMPT_RT work on i915 + xe.

Maarten Lankhorst dri-devel intel-gfx intel-xe 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest29 patches 0 repliesNew

Changes since previous version from the cover letter

- Only change: Disable PMU on i915 entirely now, no way to make it work.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/29drm/vblank_work: Add methods to schedule vblank_work in 2 stagesdrivers/gpu/drm/drm_vblank_work.c include/drm/drm_vblank_work.h+96 -260 replies
2/29drm/vblank: Add a 2-stage version of drm_crtc_arm_vblank_eventdrivers/gpu/drm/drm_vblank.c include/drm/drm_vblank.h+76 -20 replies
3/29drm/intel/display: Make intel_crtc_arm_vblank_event staticdrivers/gpu/drm/i915/display/intel_crtc.c drivers/gpu/drm/i915/display/intel_crtc.h+1 -20 replies
4/29drm/intel/display: Convert vblank event handling to 2-stage armingdrivers/gpu/drm/i915/display/intel_crtc.c+44 -400 replies
5/29drm/i915/display: Move vblank put until after critical sectiondrivers/gpu/drm/i915/display/intel_cursor.c+6 -20 replies
6/29drm/i915/display: Remove locking from intel_vblank_evade critical sectiondrivers/gpu/drm/i915/display/intel_crtc.c drivers/gpu/drm/i915/display/intel_vblank.c drivers/gpu/drm/i915/display/intel_vblank.h+15 -180 replies
7/29drm/i915/display: Handle vlv dsi workaround in scanline_in_safe_range toodrivers/gpu/drm/i915/display/intel_vblank.c+18 -180 replies
8/29drm/i915: Use preempt_disable/enable_rt() where recommendeddrivers/gpu/drm/i915/display/intel_vblank.c+33 -100 replies
9/29drm/i915/display: Make get_vblank_counter use intel_de_read_fw()drivers/gpu/drm/i915/display/intel_vblank.c+1 -10 replies
10/29drm/i915/display: Do not take uncore lock in i915_get_vblank_counterdrivers/gpu/drm/i915/display/intel_de.h drivers/gpu/drm/i915/display/intel_vblank.c drivers/gpu/drm/i915/intel_uncore.h +1 more+35 -100 replies
11/29drm/i915/display: Make icl_dsi_frame_update use _fw toodrivers/gpu/drm/i915/display/icl_dsi.c+2 -20 replies
12/29drm/i915/display: Use intel_de_read/write_fw in coloropsdrivers/gpu/drm/i915/display/intel_color.c+3 -30 replies
13/29drm/i915/display: Use intel_de_write_fw in intel_pipe_fastsetdrivers/gpu/drm/i915/display/intel_cmtg.c drivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_vrr.c+33 -330 replies
14/29drm/i915/display: Make set_pipeconf use the fw variantsdrivers/gpu/drm/i915/display/intel_display.c+6 -40 replies
15/29drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock()drivers/gpu/drm/i915/gt/intel_execlists_submission.c+5 -120 replies
16/29drm/i915: Drop the irqs_disabled() checkdrivers/gpu/drm/i915/i915_request.c+0 -20 replies
17/29drm/i915/guc: Consider also RCU depth in busy loop.drivers/gpu/drm/i915/gt/uc/intel_guc.h+1 -10 replies
18/29drm/i915/gt: Fix selftests on PREEMPT_RTdrivers/gpu/drm/i915/gt/selftest_engine_pm.c+4 -40 replies
19/29drm/i915/gt: Set stop_timeout() correctly on PREEMPT-RTdrivers/gpu/drm/i915/gt/intel_engine_cs.c+1 -10 replies
20/29drm/i915/display: Remove uncore lock from vlv_atomic_update_fifodrivers/gpu/drm/i915/display/i9xx_wm.c+0 -40 replies
21/29drm/i915: Use sleeping selftests for igt_atomic on PREEMPT_RTdrivers/gpu/drm/i915/selftests/igt_atomic.c+7 -00 replies
22/29Revert "drm/i915: Depend on !PREEMPT_RT."drivers/gpu/drm/i915/Kconfig+0 -10 replies
23/29PREEMPT_RT injectionkernel/Kconfig.preempt+2 -20 replies
24/29FOR-CI: bump MAX_STACK_TRACE_ENTRIESlib/Kconfig.debug+2 -30 replies
25/29drm/i915/gt: Add a spinlock to prevent starvation of irq_work.drivers/gpu/drm/i915/gt/intel_breadcrumbs.c drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h+8 -10 replies
26/29drm/xe: Avoid using stolen memory for DPT.drivers/gpu/drm/xe/display/xe_fb_pin.c+8 -250 replies
27/29drm/xe/display: Avoid using stolen memory for framebuffer when media gt exists.drivers/gpu/drm/xe/display/xe_display_bo.c+7 -00 replies
28/29drm/xe/display: Do not allocate into stolen for new framebuffers.drivers/gpu/drm/xe/display/xe_display_bo.c+6 -270 replies
29/29drm/i915/pmu: Disable on PREEMPT_RTdrivers/gpu/drm/i915/i915_pmu.c+10 -00 replies

Reviews trailers per patch

9 of 29 patches have a Reviewed-by or Acked-by.

PatchUma ShankarMaarten LankhorstTvrtko UrsulinRodrigo Vivi
1/29
2/29
3/29
4/29
5/29R-b
6/29
7/29R-b
8/29R-b
9/29
10/29
11/29R-b
12/29R-b
13/29
14/29
15/29R-b
16/29A-b
17/29R-b
18/29
19/29
20/29
21/29
22/29A-b
23/29
24/29
25/29
26/29
27/29
28/29
29/29

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v1 thread

Cover letter [PATCH v10.5 00/29] drm/i915/display: All patches to make PREEMPT_RT work on i915 + xe.

Still waiting for feedback on the vblank approach, and check to see if there are some bugs left.

Changes since previous version:
- Only change: Disable PMU on i915 entirely now, no way to make it work.

For Xe, we also prohibit the use of DSM when CONFIG_PREEMPT_RT is enabled, and avoid the use of DSM if we cannot take over the framebuffer from the firmware.

Ideally we copy the framebuffer after intel_fbdev_init_bios(), when we decide to preserve the framebuffer and the hardware is completely initialized.

At that point we can use the migration engine to copy the contents over, this can potentially be used for preserving the initial framebuffer in the other cases where we cannot not use the initial FB too.

Maarten Lankhorst (23):
drm/vblank_work: Add methods to schedule vblank_work in 2 stages drm/vblank: Add a 2-stage version of drm_crtc_arm_vblank_event drm/intel/display: Make intel_crtc_arm_vblank_event static drm/intel/display: Convert vblank event handling to 2-stage arming drm/i915/display: Move vblank put until after critical section drm/i915/display: Remove locking from intel_vblank_evade critical
section
drm/i915/display: Handle vlv dsi workaround in scanline_in_safe_range
too
drm/i915/display: Make get_vblank_counter use intel_de_read_fw() drm/i915/display: Do not take uncore lock in i915_get_vblank_counter drm/i915/display: Make icl_dsi_frame_update use _fw too drm/i915/display: Use intel_de_read/write_fw in colorops drm/i915/display: Use intel_de_write_fw in intel_pipe_fastset drm/i915/display: Make set_pipeconf use the fw variants drm/i915/gt: Fix selftests on PREEMPT_RT
drm/i915/gt: Set stop_timeout() correctly on PREEMPT-RT drm/i915/display: Remove uncore lock from vlv_atomic_update_fifo drm/i915: Use sleeping selftests for igt_atomic on PREEMPT_RT PREEMPT_RT injection
FOR-CI: bump MAX_STACK_TRACE_ENTRIES
drm/xe: Avoid using stolen memory for DPT.
drm/xe/display: Avoid using stolen memory for framebuffer when media
gt exists.
drm/xe/display: Do not allocate into stolen for new framebuffers. drm/i915/pmu: Disable on PREEMPT_RT

Mike Galbraith (1):
drm/i915: Use preempt_disable/enable_rt() where recommended

Sebastian Andrzej Siewior (5):
drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() +

    spin_lock()

drm/i915: Drop the irqs_disabled() check drm/i915/guc: Consider also RCU depth in busy loop. Revert "drm/i915: Depend on !PREEMPT_RT." drm/i915/gt: Add a spinlock to prevent starvation of irq_work.

 drivers/gpu/drm/drm_vblank.c                  |  64 +++++++++-
 drivers/gpu/drm/drm_vblank_work.c             | 110 +++++++++++++----
 drivers/gpu/drm/i915/Kconfig                  |   1 -
 drivers/gpu/drm/i915/display/i9xx_wm.c        |   4 -
 drivers/gpu/drm/i915/display/icl_dsi.c        |   4 +-
 drivers/gpu/drm/i915/display/intel_cmtg.c     |   6 +-
 drivers/gpu/drm/i915/display/intel_color.c    |   6 +-
 drivers/gpu/drm/i915/display/intel_crtc.c     |  86 ++++++-------
 drivers/gpu/drm/i915/display/intel_crtc.h     |   1 -
 drivers/gpu/drm/i915/display/intel_cursor.c   |   8 +-
 drivers/gpu/drm/i915/display/intel_de.h       |   8 ++
 drivers/gpu/drm/i915/display/intel_display.c  |  52 ++++----
 drivers/gpu/drm/i915/display/intel_vblank.c   | 115 ++++++++++--------
 drivers/gpu/drm/i915/display/intel_vblank.h   |   1 +
 drivers/gpu/drm/i915/display/intel_vrr.c      |  18 +--
 drivers/gpu/drm/i915/gt/intel_breadcrumbs.c   |   8 +-
 .../gpu/drm/i915/gt/intel_breadcrumbs_types.h |   1 +
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |   2 +-
 .../drm/i915/gt/intel_execlists_submission.c  |  17 +--
 drivers/gpu/drm/i915/gt/selftest_engine_pm.c  |   8 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc.h        |   2 +-
 drivers/gpu/drm/i915/i915_pmu.c               |  10 ++
 drivers/gpu/drm/i915/i915_request.c           |   2 -
 drivers/gpu/drm/i915/intel_uncore.h           |  26 ++--
 drivers/gpu/drm/i915/selftests/igt_atomic.c   |   7 ++
 .../drm/xe/compat-i915-headers/intel_uncore.h |   7 ++
 drivers/gpu/drm/xe/display/xe_display_bo.c    |  40 ++----
 drivers/gpu/drm/xe/display/xe_fb_pin.c        |  33 ++---
 include/drm/drm_vblank.h                      |  14 ++-
 include/drm/drm_vblank_work.h                 |  12 ++
 kernel/Kconfig.preempt                        |   4 +-
 lib/Kconfig.debug                             |   5 +-
 32 files changed, 429 insertions(+), 253 deletions(-)
Signature · 1 line
2.53.0