Commit 33e26f35 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



UAPI Changes:
 - Add mmap support for PCI memory barrier (Tejas, Matthew Auld)
 - Enable integration with perf pmu, exposing event counters: for now, just
   GT C6 residency (Vinay, Lucas)
 - Add "survivability mode" to allow putting the driver in a state capable of
   firmware upgrade on critical failures (Riana, Rodrigo)
 - Add PXP HWDRM support and enable for compatible platforms:
   Meteor Lake and Lunar Lake (Daniele, John Harrison)
 - Expose package and vram temperature over hwmon subsystem (Raag, Badal, Rodrigo)

Cross-subsystem Changes:
 - Backmege drm-next to synchronize with i915 display and other internal APIs

Display Changes (including i915):
 - Device probe re-order to help with flicker-free boot (Maarten)
 - Align watermark, hpd and dsm with i915 (Rodrigo)
 - Better abstraction for d3cold (Rodrigo)

Driver Changes:
 - Make sure changes to ccs_mode is with helper for gt sync reset (Maciej)
 - Drop mmio_ext abstraction since it didn't prove useful in its current form
   (Matt Roper)
 - Reject BO eviction if BO is bound to current VM (Oak, Thomas Hellström)
 - Add GuC Power Conservation debugfs (Rodrigo)
 - L3 cache topology updates for Xe3 (Francois, Matt Atwood)
 - Better logging about missing GuC logs (John Harrison)
 - Better logging for hwconfig-related data availability (John Harrison)
 - Tracepoint updates for xe_bo_create, xe_vm and xe_vma (Oak)
 - Add missing SPDX licenses (Francois)
 - Xe suballocator imporovements (Michal Wajdeczko)
 - Improve logging for native vs SR-IOV driver mode (Satyanarayana)
 - Make sure VF bootstrap is not attempted in execlist mode (Maarten)
 - Add GuC Buffer Cache abstraction for some CTB H2G actions and use
   during VF provisioning (Michal Wajdeczko)
 - Better synchronization in gtidle for new users (Vinay)
 - New workarounds for Panther Lake (Nirmoy, Vinay)
 - PCI ID updates for Panther Lake (Matt Atwood)
 - Enable SR-IOV for Panther Lake (Michal Wajdeczko)
 - Update MAINTAINERS to stop directing xe changes to drm-misc (Lucas)
 - New PCI IDs for Battle Mage (Shekhar)
 - Better pagefault logging (Francois)
 - SR-IOV fixes and refactors for past and new platforms (Michal Wajdeczko)
 - Platform descriptor refactors and updates (Sai Teja)
 - Add gt stats debugfs (Francois)
 - Add guc_log debugfs to dump to dmesg (Lucas)
 - Abstract per-platform LMTT availability (Piotr Piórkowski)
 - Refactor VRAM manager location (Piotr Piórkowski)
 - Add missing xe_pm_runtime_put when forcing wedged mode (Shuicheng)
 - Fix possible lockup when forcing wedged mode (Xin Wang)
 - Probe refactors to use cleanup actions with better error handling (Lucas)
 - XE_IOCTL_DBG clarification for userspace (Maarten)
 - Better xe_mmio initialization and abstraction (Ilia)
 - Drop unnecessary GT lookup (Matt Roper)
 - Skip client engine usage from fdinfo for VFs (Marcin Bernatowicz)
 - Allow to test xe_sync_entry_parse with error injection (Priyanka)
 - OA fix for polled read (Umesh)

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

From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/m3gbuh32wgiep43i4zxbyhxqbenvtgvtao5sczivlasj7tikwv@dmlba4bfg2ny
parents 16893dd2 b7b68c6e

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

+16 −0
Original line number Diff line number Diff line
@@ -108,3 +108,19 @@ Contact: intel-xe@lists.freedesktop.org 
Description:	RO. Package current voltage in millivolt.



		Only supported for particular Intel Xe graphics platforms.



What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/temp2_input

Date:		March 2025

KernelVersion:	6.14

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. Package temperature in millidegree Celsius.



		Only supported for particular Intel Xe graphics platforms.



What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/temp3_input

Date:		March 2025

KernelVersion:	6.14

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. VRAM temperature in millidegree Celsius.



		Only supported for particular Intel Xe graphics platforms.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7673,6 +7673,7 @@ X: drivers/gpu/drm/msm/ 
X:	drivers/gpu/drm/nouveau/

X:	drivers/gpu/drm/radeon/

X:	drivers/gpu/drm/tegra/

X:	drivers/gpu/drm/xe/









DRM DRIVERS FOR ALLWINNER A10









M:	Maxime Ripard <mripard@kernel.org>
































drivers/gpu/drm/i915/display/intel_display.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -685,7 +685,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,







	if ((crtc_state->active_planes & ~BIT(PLANE_CURSOR)) == 0 &&









	    hsw_ips_disable(crtc_state)) {









		crtc_state->ips_enabled = false;









		intel_crtc_wait_for_next_vblank(crtc);









		intel_plane_initial_vblank_wait(crtc);









	}



















	/*








@@ -699,7 +699,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,







	 */









	if (HAS_GMCH(dev_priv) &&









	    intel_set_memory_cxsr(dev_priv, false))









		intel_crtc_wait_for_next_vblank(crtc);









		intel_plane_initial_vblank_wait(crtc);



















	/*









	 * Gen2 reports pipe underruns whenever all planes are disabled.








@@ -709,7 +709,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,







		intel_set_cpu_fifo_underrun_reporting(display, crtc->pipe, false);



















	intel_plane_disable_arm(NULL, plane, crtc_state);









	intel_crtc_wait_for_next_vblank(crtc);









	intel_plane_initial_vblank_wait(crtc);









}



















unsigned int
































drivers/gpu/drm/i915/display/intel_display_driver.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -564,6 +564,8 @@ void intel_display_driver_register(struct intel_display *display)

















	intel_display_device_info_print(DISPLAY_INFO(display),









					DISPLAY_RUNTIME_INFO(display), &p);



















	intel_register_dsm_handler();









}



















/* part #1: call before irq uninstall */








@@ -639,6 +641,8 @@ void intel_display_driver_unregister(struct intel_display *display)







	if (!HAS_DISPLAY(display))









		return;



















	intel_unregister_dsm_handler();



















	drm_client_dev_unregister(display->drm);



















	/*
































drivers/gpu/drm/i915/display/intel_plane_initial.c



+6
−1






























Original line number
Diff line number
Diff line







@@ -14,6 +14,11 @@







#include "intel_frontbuffer.h"









#include "intel_plane_initial.h"



















void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)









{









	intel_crtc_wait_for_next_vblank(crtc);









}



















static bool









intel_reuse_initial_plane_obj(struct intel_crtc *this,









			      const struct intel_initial_plane_config plane_configs[],








@@ -442,7 +447,7 @@ void intel_initial_plane_config(struct intel_display *display)







		intel_find_initial_plane_obj(crtc, plane_configs);



















		if (display->funcs.display->fixup_initial_plane_config(crtc, plane_config))









			intel_crtc_wait_for_next_vblank(crtc);









			intel_plane_initial_vblank_wait(crtc);



















		plane_config_fini(plane_config);









	}