[PULL] drm-xe-fixes

[Thomas Hellstrom <thomas.hellstrom@linux.intel.com>]

Hi Dave, Simona!

Here's the drm-xe-fixes PR towards -rc2.

Mostly various fixes sprinkled all over the place, with the notable
exception of the RTP/OA whitelist fixes backport, manly by Ashutosh

Thanks,
Thomas

drm-xe-fixes-2026-07-02:
Driver Changes:
- Wedge from the timeout handler only after releasing the queue (Rodrigo)
- Fix a NULL pointer dereference (Francois)
- Remove redundant exec_queue_suspended (Lu)
- RTP / OA whitelist fixes (Ashutosh, Gustavo, Thomas)
- Return error on non-migratable faults requiring devmem (Matt Brost)
- Skip FORCE_WC and vm_bound check for external dma-bufs (Matt Auld)
- Hold notifier lock for write on inject test path (Shuicheng)
- Drop bogus static from finish in force_invalidate (Shuicheng)
- Fix double-free of managed BO in error path (Shuicheng)
- Don't attempt to process FAST_REQ or EVENT relays (Michal)
- Fix NPD in bo_meminfo (Matthew Auld)
- Prevent invalid cursor access for purged BOs (Matthew Auld)
- Fix offset alignment for MERT WHITELST_OA_MERT_MMIO_TRG (Ashutosh)
The following changes since commit dc59e4fea9d83f03bad6bddf3fa2e52491777482:

  Linux 7.2-rc1 (2026-06-28 12:01:31 -0700)

are available in the Git repository at:

  https://gitlab.freedesktop.org/drm/xe/kernel.git tags/drm-xe-fixes-2026-07-02

for you to fetch changes up to 959b5016e4646b55fd2fd0438932e4c4e9ce171f:

  drm/xe/oa: Fix offset alignment for MERT WHITELIST_OA_MERT_MMIO_TRG (2026-07-02 12:29:44 +0200)

----------------------------------------------------------------
Driver Changes:
- Wedge from the timeout handler only after releasing the queue (Rodrigo)
- Fix a NULL pointer dereference (Francois)
- Remove redundant exec_queue_suspended (Lu)
- RTP / OA whitelist fixes (Ashutosh, Gustavo, Thomas)
- Return error on non-migratable faults requiring devmem (Matt Brost)
- Skip FORCE_WC and vm_bound check for external dma-bufs (Matt Auld)
- Hold notifier lock for write on inject test path (Shuicheng)
- Drop bogus static from finish in force_invalidate (Shuicheng)
- Fix double-free of managed BO in error path (Shuicheng)
- Don't attempt to process FAST_REQ or EVENT relays (Michal)
- Fix NPD in bo_meminfo (Matthew Auld)
- Prevent invalid cursor access for purged BOs (Matthew Auld)
- Fix offset alignment for MERT WHITELST_OA_MERT_MMIO_TRG (Ashutosh)

----------------------------------------------------------------
Ashutosh Dixit (10):
      drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists
      drm/xe/rtp: Maintain OA whitelists separately
      drm/xe/rtp: Keep track of non-OA nonpriv slots
      drm/xe/rtp: Generalize whitelist_apply_to_hwe
      drm/xe/rtp: Save OA nonpriv registers to register save/restore lists
      drm/xe/rtp: Toggle 'deny' bit to (de-)whitelist OA regs
      drm/xe/rtp: (De-)whitelist OA registers for all hwe's for a gt
      drm/xe/oa: (De-)whitelist OA registers on OA stream open/release
      drm/xe/rtp: Ensure locking/ref counting for OA whitelists
      drm/xe/oa: Fix offset alignment for MERT WHITELIST_OA_MERT_MMIO_TRG

Francois Dugast (1):
      drm/xe/pt: Fix NULL pointer dereference in xe_pt_zap_ptes_entry()

Gustavo Sousa (1):
      drm/xe/rtp: Add struct types for RTP tables

Lu Yao (1):
      drm/xe: Remove redundant exec_queue_suspended() check in submit_exec_queue()

Matthew Auld (3):
      drm/xe/display: skip FORCE_WC and vm_bound check for external dma-bufs
      drm/xe: fix NPD in bo_meminfo()
      drm/xe/pt: prevent invalid cursor access for purged BOs

Matthew Brost (1):
      drm/xe: Return error on non-migratable faults requiring devmem

Michal Wajdeczko (1):
      drm/xe/pf: Don't attempt to process FAST_REQ or EVENT relays

Rodrigo Vivi (1):
      drm/xe: wedge from the timeout handler only after releasing the queue

Shuicheng Lin (3):
      drm/xe/userptr: Hold notifier_lock for write on inject test path
      drm/xe/userptr: Drop bogus static from finish in force_invalidate
      drm/xe/hw_engine: Fix double-free of managed BO in error path

Thomas Hellström (1):
      drm/xe/rtp: Fix build error with clang < 21 and non-const initializers

 drivers/gpu/drm/xe/display/xe_display_bo.c |   3 +-
 drivers/gpu/drm/xe/display/xe_fb_pin.c     |   3 +-
 drivers/gpu/drm/xe/tests/xe_rtp_test.c     | 103 +++++++++++------------------
 drivers/gpu/drm/xe/xe_drm_client.c         |  12 +++-
 drivers/gpu/drm/xe/xe_gt_debugfs.c         |   4 +-
 drivers/gpu/drm/xe/xe_guc_relay.c          |  13 ++--
 drivers/gpu/drm/xe/xe_guc_submit.c         |   9 ++-
 drivers/gpu/drm/xe/xe_hw_engine.c          |  20 +++---
 drivers/gpu/drm/xe/xe_hw_engine_types.h    |   8 +++
 drivers/gpu/drm/xe/xe_oa.c                 |   7 ++
 drivers/gpu/drm/xe/xe_oa_types.h           |   3 +
 drivers/gpu/drm/xe/xe_pt.c                 |  67 ++++++++++++++-----
 drivers/gpu/drm/xe/xe_reg_whitelist.c      | 102 ++++++++++++++++++++++++----
 drivers/gpu/drm/xe/xe_reg_whitelist.h      |   4 ++
 drivers/gpu/drm/xe/xe_rtp.c                |  31 ++++-----
 drivers/gpu/drm/xe/xe_rtp.h                |  24 ++++++-
 drivers/gpu/drm/xe/xe_rtp_types.h          |  10 +++
 drivers/gpu/drm/xe/xe_svm.c                |   6 +-
 drivers/gpu/drm/xe/xe_svm.h                |  15 ++++-
 drivers/gpu/drm/xe/xe_tuning.c             |  45 ++++++-------
 drivers/gpu/drm/xe/xe_userptr.c            |   2 +-
 drivers/gpu/drm/xe/xe_wa.c                 |  89 +++++++++++++------------
 22 files changed, 376 insertions(+), 204 deletions(-)