Skip to content

Commit d2b9e2f

Browse files
airliedairlied
committed
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: Dave Airlie <[email protected]> From: Thomas Hellstrom <[email protected]> Link: https://lore.kernel.org/r/aADWaEFKVmxSnDLo@fedora
2 parents 55df7c0 + d755887 commit d2b9e2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2131
-820
lines changed

‎Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,27 @@ Contact: [email protected]
124124
Description: RO. VRAM temperature in millidegree Celsius.
125125

126126
Only supported for particular Intel Xe graphics platforms.
127+
128+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/fan1_input
129+
Date: March 2025
130+
KernelVersion: 6.14
131+
Contact: [email protected]
132+
Description: RO. Fan 1 speed in RPM.
133+
134+
Only supported for particular Intel Xe graphics platforms.
135+
136+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/fan2_input
137+
Date: March 2025
138+
KernelVersion: 6.14
139+
Contact: [email protected]
140+
Description: RO. Fan 2 speed in RPM.
141+
142+
Only supported for particular Intel Xe graphics platforms.
143+
144+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/fan3_input
145+
Date: March 2025
146+
KernelVersion: 6.14
147+
Contact: [email protected]
148+
Description: RO. Fan 3 speed in RPM.
149+
150+
Only supported for particular Intel Xe graphics platforms.

‎Documentation/gpu/xe/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ DG2, etc is provided to prototype the driver.
2525
xe_debugging
2626
xe_devcoredump
2727
xe-drm-usage-stats.rst
28+
xe_configfs

‎Documentation/gpu/xe/xe_configfs.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.. SPDX-License-Identifier: GPL-2.0+
2+
3+
.. _xe_configfs:
4+
5+
============
6+
Xe Configfs
7+
============
8+
9+
.. kernel-doc:: drivers/gpu/drm/xe/xe_configfs.c
10+
:doc: Xe Configfs

‎Documentation/gpu/xe/xe_pcode.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@ Internal API
1212

1313
.. kernel-doc:: drivers/gpu/drm/xe/xe_pcode.c
1414
:internal:
15+
16+
==================
17+
Boot Survivability
18+
==================
19+
20+
.. kernel-doc:: drivers/gpu/drm/xe/xe_survivability_mode.c
21+
:doc: Xe Boot Survivability

‎drivers/gpu/drm/xe/Kconfig

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ config DRM_XE
3939
select DRM_TTM_HELPER
4040
select DRM_EXEC
4141
select DRM_GPUVM
42-
select DRM_GPUSVM if !UML && DEVICE_PRIVATE
4342
select DRM_SCHED
4443
select MMU_NOTIFIER
4544
select WANT_DEV_COREDUMP
@@ -74,9 +73,22 @@ config DRM_XE_DP_TUNNEL
7473

7574
If in doubt say "Y".
7675

76+
config DRM_XE_GPUSVM
77+
bool "Enable CPU to GPU address mirroring"
78+
depends on DRM_XE
79+
depends on !UML
80+
depends on DEVICE_PRIVATE
81+
default y
82+
select DRM_GPUSVM
83+
help
84+
Enable this option if you want support for CPU to GPU address
85+
mirroring.
86+
87+
If in doubut say "Y".
88+
7789
config DRM_XE_DEVMEM_MIRROR
7890
bool "Enable device memory mirror"
79-
depends on DRM_XE
91+
depends on DRM_XE_GPUSVM
8092
select GET_FREE_REGION
8193
default y
8294
help

‎drivers/gpu/drm/xe/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,13 @@ xe-y += xe_bb.o \
125125
xe_wopcm.o
126126

127127
xe-$(CONFIG_HMM_MIRROR) += xe_hmm.o
128-
xe-$(CONFIG_DRM_GPUSVM) += xe_svm.o
128+
xe-$(CONFIG_DRM_XE_GPUSVM) += xe_svm.o
129129

130130
# graphics hardware monitoring (HWMON) support
131131
xe-$(CONFIG_HWMON) += xe_hwmon.o
132132

133133
xe-$(CONFIG_PERF_EVENTS) += xe_pmu.o
134+
xe-$(CONFIG_CONFIGFS_FS) += xe_configfs.o
134135

135136
# graphics virtualization (SR-IOV) support
136137
xe-y += \

‎drivers/gpu/drm/xe/abi/guc_actions_abi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ enum xe_guc_action {
141141
XE_GUC_ACTION_CLIENT_SOFT_RESET = 0x5507,
142142
XE_GUC_ACTION_SET_ENG_UTIL_BUFF = 0x550A,
143143
XE_GUC_ACTION_SET_DEVICE_ENGINE_ACTIVITY_BUFFER = 0x550C,
144+
XE_GUC_ACTION_SET_FUNCTION_ENGINE_ACTIVITY_BUFFER = 0x550D,
144145
XE_GUC_ACTION_NOTIFY_MEMORY_CAT_ERROR = 0x6000,
145146
XE_GUC_ACTION_REPORT_PAGE_FAULT_REQ_DESC = 0x6002,
146147
XE_GUC_ACTION_PAGE_FAULT_RES_DESC = 0x6003,

‎drivers/gpu/drm/xe/abi/guc_klvs_abi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ enum xe_guc_klv_ids {
367367
GUC_WA_KLV_NP_RD_WRITE_TO_CLEAR_RCSM_AT_CGP_LATE_RESTORE = 0x9008,
368368
GUC_WORKAROUND_KLV_ID_BACK_TO_BACK_RCS_ENGINE_RESET = 0x9009,
369369
GUC_WA_KLV_WAKE_POWER_DOMAINS_FOR_OUTBOUND_MMIO = 0x900a,
370+
GUC_WA_KLV_RESET_BB_STACK_PTR_ON_VF_SWITCH = 0x900b,
370371
};
371372

372373
#endif

‎drivers/gpu/drm/xe/display/intel_fbdev_fb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
4545
NULL, size,
4646
ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
4747
XE_BO_FLAG_STOLEN |
48-
XE_BO_FLAG_GGTT | XE_BO_FLAG_PINNED);
48+
XE_BO_FLAG_GGTT);
4949
if (!IS_ERR(obj))
5050
drm_info(&xe->drm, "Allocated fbdev into stolen\n");
5151
else
@@ -56,7 +56,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
5656
obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe), NULL, size,
5757
ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
5858
XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |
59-
XE_BO_FLAG_GGTT | XE_BO_FLAG_PINNED);
59+
XE_BO_FLAG_GGTT);
6060
}
6161

6262
if (IS_ERR(obj)) {

‎drivers/gpu/drm/xe/display/xe_plane_initial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ initial_plane_bo(struct xe_device *xe,
8383
if (plane_config->size == 0)
8484
return NULL;
8585

86-
flags = XE_BO_FLAG_PINNED | XE_BO_FLAG_SCANOUT | XE_BO_FLAG_GGTT;
86+
flags = XE_BO_FLAG_SCANOUT | XE_BO_FLAG_GGTT;
8787

8888
base = round_down(plane_config->base, page_size);
8989
if (IS_DGFX(xe)) {

0 commit comments

Comments
 (0)