Commit 9ec3c8ee authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-2025-12-19' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next 



[airlied: fix guc submit double definition]
UAPI Changes:
- Multi-Queue support (Niranjana)
- Add DRM_XE_EXEC_QUEUE_SET_HANG_REPLAY_STATE (Brost)
- Add NO_COMPRESSION BO flag and query capability (Sanjay)
- Add gt_id to struct drm_xe_oa_unit (Ashutosh)
- Expose MERT OA unit (Ashutosh)
- Sysfs Survivability refactor (Riana)

Cross-subsystem Changes:
- VFIO: Add device specific vfio_pci driver variant for Intel graphics (Winiarski)

Driver Changes:
- MAINTAINERS update (Lucas -> Matt)
- Add helper to query compression enable status (Xin)
- Xe_VM fixes and updates (Shuicheng, Himal)
- Documentation fixes (Winiarski, Swaraj, Niranjana)
- Kunit fix (Roper)
- Fix potential leaks, uaf, null derref, and oversized
  allocations (Shuicheng, Sanjay, Mika, Tapani)
- Other minor fixes like kbuild duplication and sysfs_emit (Shuicheng, Madhur)
- Handle msix vector0 interrupt (Venkata)
- Scope-based forcewake and runtime PM (Roper, Raag)
- GuC/HuC related fixes and refactors (Lucas, Zhanjun, Brost, Julia, Wajdeczko)
- Fix conversion from clock ticks to milliseconds (Harish)
- SRIOV PF PF: Add support for MERT (Lukasz)
- Enable SR-IOV VF migration and other SRIOV updates (Winiarski,
  Satya, Brost, Wajdeczko, Piotr, Tomasz, Daniele)
- Optimize runtime suspend/resume and other PM improvements (Raag)
- Some W/a additions and updates (Bala, Harish, Roper)
- Use for_each_tlb_inval() to calculate invalidation fences (Roper)
- Fix VFIO link error (Arnd)
- Fix ix drm_gpusvm_init() arguments (Arnd)
- Other OA refactor (Ashutosh)
- Refactor PAT and expose debugfs (Xin)
- Enable Indirect Ring State for xe3p_xpc (Niranjana)
- MEI interrupt fix (Junxiao)
- Add stats for mode switching on hw_engine_group (Francois)
- DMA-Buf related changes (Thomas)
- Multi Queue feature support (Niranjana)
- Enable I2C controller for Crescent Island (Raag)
- Enable NVM for Crescent Island (Sasha)
- Increase TDF timeout (Jagmeet)
- Restore engine registers before restarting schedulers after GT reset (Jan)
- Page Reclamation Support for Xe3p Platforms (Brian, Brost, Oak)
- Fix performance when pagefaults and 3d/display share resources (Brost)
- More OA MERT work (Ashutosh)
- Fix return values (Dan)
- Some log level and messages improvements (Brost)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/aUXUhEgzs6hDLQuu@intel.com
parents c5fb82d1 844758bd

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com> 
Lorenzo Stoakes <lorenzo.stoakes@oracle.com> <lstoakes@gmail.com>

Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>

Luca Weiss <luca@lucaweiss.eu> <luca@z3ntu.xyz>

Lucas De Marchi <demarchi@kernel.org> <lucas.demarchi@intel.com>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Luo Jie <quic_luoj@quicinc.com> <luoj@codeaurora.org>

Lance Yang <lance.yang@linux.dev> <ioworker0@gmail.com>

Documentation/ABI/testing/sysfs-driver-intel-xe-sriov

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ Description: 
			The GT preemption timeout (PT) in [us] to be applied to all functions.

			See sriov_admin/{pf,vf<N>}/profile/preempt_timeout_us for more details.



		sched_priority: (RW/RO) string

		sched_priority: (WO) string

			The GT scheduling priority to be applied for all functions.

			See sriov_admin/{pf,vf<N>}/profile/sched_priority for more details.

Documentation/gpu/xe/xe_exec_queue.rst

+14 −0
Original line number Diff line number Diff line
@@ -7,6 +7,20 @@ Execution Queue 
.. kernel-doc:: drivers/gpu/drm/xe/xe_exec_queue.c

   :doc: Execution Queue



Multi Queue Group

=================



.. kernel-doc:: drivers/gpu/drm/xe/xe_exec_queue.c

   :doc: Multi Queue Group



.. _multi-queue-group-guc-interface:



Multi Queue Group GuC interface

===============================



.. kernel-doc:: drivers/gpu/drm/xe/xe_guc_submit.c

   :doc: Multi Queue Group GuC interface



Internal API

============

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -12640,7 +12640,7 @@ F: include/drm/intel/ 
F:	include/uapi/drm/i915_drm.h









INTEL DRM XE DRIVER (Lunar Lake and newer)









M:	Lucas De Marchi <lucas.demarchi@intel.com>









M:	Matthew Brost <matthew.brost@intel.com>









M:	Thomas Hellström <thomas.hellstrom@linux.intel.com>









M:	Rodrigo Vivi <rodrigo.vivi@intel.com>









L:	intel-xe@lists.freedesktop.org
































drivers/gpu/drm/drm_gpusvm.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -1288,6 +1288,9 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm,







							   DMA_BIDIRECTIONAL;



















retry:









	if (time_after(jiffies, timeout))









		return -EBUSY;



















	hmm_range.notifier_seq = mmu_interval_read_begin(notifier);









	if (drm_gpusvm_pages_valid_unlocked(gpusvm, svm_pages))









		goto set_seqno;