Commit d2b9e2f8 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Core Changes:
Fix drm_gpusvm kernel-doc (Lucas)

Driver Changes:
- Release guc ids before cancelling work (Tejas)
- Remove a duplicated pc_start_call (Rodrigo)
- Fix an incorrect assert in previous userptr fixes (Thomas)
- Remove gen11 assertions and prefixes (Lucas)
- Drop sentinels from arg to xe_rtp_process_to_src (Lucas)
- Temporarily disable D3Cold on BMG (Rodrigo)
- Fix MOCS debugfs LNCF readout (Tvrtko)
- Some ring flush cleanups (Tvrtko)
- Use unsigned int for alignment in fb pinning code (Tvrtko)
- Retry and wait longer for GuC PC start (Rodrigo)
- Recognize 3DSTATE_COARSE_PIXEL in LRC dumps (Matt Roper)
- Remove reduntant check in xe_vm_create_ioctl() (Xin)
- A bunch of SRIOV updates (Michal)
- Add stats for SVM page-faults (Francois)
- Fix an UAF (Harish)
- Expose fan speed (Raag)
- Fix exporting xe buffer objects multiple times (Tomasz)
- Apply a workaround (Vinay)
- Simplify pinned bo iteration (Thomas)
- Remove an incorrect "static" keywork (Lucas)
- Add support for separate firmware files on each GT (Lucas)
- Survivability handling fixes (Lucas)
- Allow to inject error in early probe (Lucas)
- Fix unmet direct dependencies warning (Yue Haibing)
- More error injection during probe (Francois)
- Coding style fix (Maarten)
- Additional stats support (Riana)
- Add fault injection for xe_oa_alloc_regs (Nakshrtra)
- Add a BMG PCI ID (Matt Roper)
- Some SVM fixes and preliminary SVM multi-device work (Thomas)
- Switch the migrate code from drm managed to dev managed (Aradhya)
- Fix an out-of-bounds shift when invalidating TLB (Thomas)
- Ensure fixed_slice_mode gets set after ccs_mode change (Niranjana)
- Use local fence in error path of xe_migrate_clear (Matthew Brost)
- More Workarounds (Julia)
- Define sysfs_ops on all directories (Tejas)
- Set power state to D3Cold during s2idle/s3 (Badal)
- Devcoredump output fix (John)
- Avoid plain 64-bit division (Arnd Bergmann)
- Reword a debug message (John)
- Don't print a hwconfig error message when forcing execlists (Stuart)
- Restore an error code to avoid a smatch warning (Rodrigo)
- Invalidate L3 read-only cachelines for geometry streams too (Kenneth)
- Make PPHWSP size explicit in xe_gt_lrc_size() (Gustavo)
- Add GT frequency events (Vinay)
- Fix xe_pt_stage_bind_walk kerneldoc (Thomas)
- Add a workaround (Aradhya)
- Rework pinned save/restore (Matthew Auld, Matthew Brost)
- Allow non-contig VRAM kernel BO (Matthew Auld)
- Support non-contig VRAM provisioning for SRIOV (Matthew Auld)
- Allow scratch-pages for unmapped parts of page-faulting VMs. (Oak)
- Ensure XE_BO_FLAG_CPU_ADDR_MIRROR had a unique value (Matt Roper)
- Fix taking an invalid lock on wedge (Lucas)
- Configs and documentation for survivability mode (Riana)
- Remove an unused macro (Shuicheng)
- Work around a page-fault full error (Matt Brost)
- Enable a SRIOV workaround (John)
- Bump the recommended GuC version (John)
- Allow to drop VRAM resizing (Lucas)
- Don't expose privileged debugfs files if VF (Michal)
- Don't show GGTT/LMEM debugfs files under media GT (Michal)
- Adjust ring-buffer emission for maximum possible size (Tvrtko)
- Fix notifier vs folio lock deadlock (Matthew Auld)
- Stop relying on placement for dma-buf unmap Matthew Auld)

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

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://lore.kernel.org/r/aADWaEFKVmxSnDLo@fedora
parents 55df7c0c d755887f
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
@@ -124,3 +124,27 @@ Contact: intel-xe@lists.freedesktop.org
Description:	RO. VRAM temperature in millidegree Celsius.

		Only supported for particular Intel Xe graphics platforms.

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/fan1_input
Date:		March 2025
KernelVersion:	6.14
Contact:	intel-xe@lists.freedesktop.org
Description:	RO. Fan 1 speed in RPM.

		Only supported for particular Intel Xe graphics platforms.

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/fan2_input
Date:		March 2025
KernelVersion:	6.14
Contact:	intel-xe@lists.freedesktop.org
Description:	RO. Fan 2 speed in RPM.

		Only supported for particular Intel Xe graphics platforms.

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/fan3_input
Date:		March 2025
KernelVersion:	6.14
Contact:	intel-xe@lists.freedesktop.org
Description:	RO. Fan 3 speed in RPM.

		Only supported for particular Intel Xe graphics platforms.
+1 −0
Original line number Diff line number Diff line
@@ -25,3 +25,4 @@ DG2, etc is provided to prototype the driver.
   xe_debugging
   xe_devcoredump
   xe-drm-usage-stats.rst
   xe_configfs
+10 −0
Original line number Diff line number Diff line
.. SPDX-License-Identifier: GPL-2.0+

.. _xe_configfs:

============
Xe Configfs
============

.. kernel-doc:: drivers/gpu/drm/xe/xe_configfs.c
   :doc: Xe Configfs
+7 −0
Original line number Diff line number Diff line
@@ -12,3 +12,10 @@ Internal API

.. kernel-doc:: drivers/gpu/drm/xe/xe_pcode.c
   :internal:

==================
Boot Survivability
==================

.. kernel-doc:: drivers/gpu/drm/xe/xe_survivability_mode.c
   :doc: Xe Boot Survivability
+14 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ config DRM_XE
	select DRM_TTM_HELPER
	select DRM_EXEC
	select DRM_GPUVM
	select DRM_GPUSVM if !UML && DEVICE_PRIVATE
	select DRM_SCHED
	select MMU_NOTIFIER
	select WANT_DEV_COREDUMP
@@ -74,9 +73,22 @@ config DRM_XE_DP_TUNNEL

	  If in doubt say "Y".

config DRM_XE_GPUSVM
	bool "Enable CPU to GPU address mirroring"
	depends on DRM_XE
	depends on !UML
	depends on DEVICE_PRIVATE
	default y
	select DRM_GPUSVM
	help
	  Enable this option if you want support for CPU to GPU address
	  mirroring.

	  If in doubut say "Y".

config DRM_XE_DEVMEM_MIRROR
	bool "Enable device memory mirror"
	depends on DRM_XE
	depends on DRM_XE_GPUSVM
	select GET_FREE_REGION
	default y
	help
Loading