Merge drm/drm-next into drm-xe-next

Sync to fix conlicts between drm-xe-next and drm-intel-next.

Signed-off-by: Lucas De Marchi <[email protected]>

Author: lucasdemarchi

.clippy.toml

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
+msrv = "1.78.0"
+
 check-private-items = true
 
 disallowed-macros = [

.gitignore

@@ -22,6 +22,7 @@
 *.dtb.S
 *.dtbo.S
 *.dwo
+*.dylib
 *.elf
 *.gcno
 *.gcda

.mailmap

@@ -83,6 +83,13 @@ Anirudh Ghayal <[email protected]> <[email protected]>
 Antoine Tenart <[email protected]> <[email protected]>
 Antoine Tenart <[email protected]> <[email protected]>
 Antonio Ospite <[email protected]> <[email protected]>
+Antonio Quartulli <[email protected]> <[email protected]>
+Antonio Quartulli <[email protected]> <[email protected]>
+Antonio Quartulli <[email protected]> <[email protected]>
+Antonio Quartulli <[email protected]> <[email protected]>
+Antonio Quartulli <[email protected]> <[email protected]>
+Antonio Quartulli <[email protected]> <[email protected]>
+Antonio Quartulli <[email protected]> <[email protected]>
 Anup Patel <[email protected]> <[email protected]>
 Archit Taneja <[email protected]>
 Ard Biesheuvel <[email protected]> <[email protected]>
@@ -135,13 +142,17 @@ Boris Brezillon <[email protected]> <[email protected]>
 Boris Brezillon <[email protected]> <[email protected]>
 Brendan Higgins <[email protected]> <[email protected]>
 Brian Avery <[email protected]>
+Brian Cain <[email protected]> <[email protected]>
+Brian Cain <[email protected]> <[email protected]>
 Brian King <[email protected]>
 Brian Silverman <[email protected]> <[email protected]>
 Bryan Tan <[email protected]> <[email protected]>
 Cai Huoqing <[email protected]> <[email protected]>
 Can Guo <[email protected]> <[email protected]>
 Carl Huang <[email protected]> <[email protected]>
-Carlos Bilbao <[email protected]> <[email protected]>
+Carlos Bilbao <[email protected]> <[email protected]>
+Carlos Bilbao <[email protected]> <[email protected]>
+Carlos Bilbao <[email protected]> <[email protected]>
 Changbin Du <[email protected]> <[email protected]>
 Changbin Du <[email protected]> <[email protected]>
 Chao Yu <[email protected]> <[email protected]>
@@ -158,6 +169,7 @@ Christian Brauner <[email protected]> <[email protected]>
 Christian Brauner <[email protected]> <[email protected]>
 Christian Marangi <[email protected]>
 Christophe Ricard <[email protected]>
+Christopher Obbard <[email protected]> <[email protected]>
 Christoph Hellwig <[email protected]>
 Chuck Lever <[email protected]> <[email protected]>
 Chuck Lever <[email protected]> <[email protected]>
@@ -214,6 +226,7 @@ Fangrui Song <[email protected]> <[email protected]>
 Felipe W Damasio <[email protected]>
 Felix Kuhling <[email protected]>
 Felix Moeller <[email protected]>
+Feng Tang <[email protected]> <[email protected]>
 Fenglin Wu <[email protected]> <[email protected]>
 Filipe Lautert <[email protected]>
 Finn Thain <[email protected]> <[email protected]>
@@ -254,6 +267,7 @@ Guo Ren <[email protected]> <[email protected]>
 Guru Das Srinagesh <[email protected]> <[email protected]>
 Gustavo Padovan <[email protected]>
 Gustavo Padovan <[email protected]>
+Hamza Mahfooz <[email protected]> <[email protected]>
 Hanjun Guo <[email protected]> <[email protected]>
 Hans Verkuil <[email protected]> <[email protected]>
 Hans Verkuil <[email protected]> <[email protected]>
@@ -304,6 +318,8 @@ Jayachandran C <[email protected]> <[email protected]>
 Jean Tourrilhes <[email protected]>
 Jeevan Shriram <[email protected]> <[email protected]>
 Jeff Garzik <[email protected]>
+Jeff Johnson <[email protected]> <[email protected]>
+Jeff Johnson <[email protected]> <[email protected]>
 Jeff Layton <[email protected]> <[email protected]>
 Jeff Layton <[email protected]> <[email protected]>
 Jeff Layton <[email protected]> <[email protected]>
@@ -363,6 +379,7 @@ Juha Yrjola <[email protected]>
 Julien Thierry <[email protected]> <[email protected]>
 Iskren Chernev <[email protected]> <[email protected]>
 Kalle Valo <[email protected]> <[email protected]>
+Kalle Valo <[email protected]> <[email protected]>
 Kalyan Thota <[email protected]> <[email protected]>
 Karthikeyan Periyasamy <[email protected]> <[email protected]>
 Kathiravan T <[email protected]> <[email protected]>
@@ -408,6 +425,7 @@ Liam Mark <[email protected]> <[email protected]>
 Linas Vepstas <[email protected]>
 Linus Lüssing <[email protected]> <[email protected]>
 Linus Lüssing <[email protected]> <[email protected]>
+Linus Lüssing <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 Li Yang <[email protected]> <[email protected]>
 Li Yang <[email protected]> <[email protected]>
@@ -430,6 +448,8 @@ Marcin Nowakowski <[email protected]> <[email protected]>
 Marc Zyngier <[email protected]> <[email protected]>
 Marek Behún <[email protected]> <[email protected]>
 Marek Behún <[email protected]> Marek Behun <[email protected]>
+Marek Lindner <[email protected]> <[email protected]>
+Marek Lindner <[email protected]> <[email protected]>
 Mark Brown <[email protected]>
 Mark Starovoytov <[email protected]> <[email protected]>
 Markus Schneider-Pargmann <[email protected]> <[email protected]>
@@ -514,6 +534,7 @@ Nicholas Piggin <[email protected]> <[email protected]>
 Nicholas Piggin <[email protected]> <[email protected]>
 Nicholas Piggin <[email protected]> <[email protected]>
 Nicholas Piggin <[email protected]> <[email protected]>
+Nick Desaulniers <[email protected]> <[email protected]>
 Nicolas Ferre <[email protected]> <[email protected]>
 Nicolas Pitre <[email protected]> <[email protected]>
 Nicolas Pitre <[email protected]> <[email protected]>
@@ -532,6 +553,8 @@ Oleksij Rempel <[email protected]> <[email protected]>
 Oleksij Rempel <[email protected]> <[email protected]>
 Oleksij Rempel <[email protected]>
 Oleksij Rempel <[email protected]> <[email protected]>
+Oliver Hartkopp <[email protected]> <[email protected]>
+Oliver Hartkopp <[email protected]> <[email protected]>
 Oliver Upton <[email protected]> <[email protected]>
 Ondřej Jirman <[email protected]> <[email protected]>
 Oza Pawandeep <[email protected]> <[email protected]>
@@ -643,6 +666,11 @@ Simona Vetter <[email protected]> <[email protected]>
 Simon Horman <[email protected]> <[email protected]>
 Simon Horman <[email protected]> <[email protected]>
 Simon Kelley <[email protected]>
+Simon Wunderlich <[email protected]> <[email protected]>
+Simon Wunderlich <[email protected]> <[email protected]>
+Simon Wunderlich <[email protected]> <[email protected]>
+Simon Wunderlich <[email protected]> <[email protected]>
+Simon Wunderlich <[email protected]> <[email protected]>
 Sricharan Ramabadhran <[email protected]> <[email protected]>
 Srinivas Ramana <[email protected]> <[email protected]>
 Sriram R <[email protected]> <[email protected]>
@@ -663,6 +691,11 @@ Sudarshan Rajagopalan <[email protected]> <[email protected]>
 Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
 Sumit Semwal <[email protected]>
 Surabhi Vishnoi <[email protected]> <[email protected]>
+Sven Eckelmann <[email protected]> <[email protected]>
+Sven Eckelmann <[email protected]> <[email protected]>
+Sven Eckelmann <[email protected]> <[email protected]>
+Sven Eckelmann <[email protected]> <[email protected]>
+Sven Eckelmann <[email protected]> <[email protected]>
 Takashi YOSHII <[email protected]>
 Tamizh Chelvam Raja <[email protected]> <[email protected]>
 Taniya Das <[email protected]> <[email protected]>
@@ -739,6 +772,7 @@ Wolfram Sang <[email protected]> <[email protected]>
 Yakir Yang <[email protected]> <[email protected]>
 Yanteng Si <[email protected]> <[email protected]>
 Ying Huang <[email protected]> <[email protected]>
+Yosry Ahmed <[email protected]> <[email protected]>
 Yusuke Goda <[email protected]>
 Zack Rusin <[email protected]> <[email protected]>
 Zhu Yanjun <[email protected]> <[email protected]>

CREDITS

@@ -2515,11 +2515,9 @@ D: SLS distribution
 D: Initial implementation of VC's, pty's and select()
 
 N: Pavel Machek
-E: pavel@ucw.cz
+E: pavel@kernel.org
 P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585  B8C7 C060 2241 92DF CE96
-D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
-D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
-D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
+D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
 D: Altera SoCFPGA and Nokia N900 support.
 S: Czech Republic
 
@@ -3948,6 +3946,10 @@ S: 1 Amherst Street
 S: Cambridge, Massachusetts 02139
 S: USA
 
+N: Luben Tuikov
+E: Luben Tuikov <[email protected]>
+D: Maintainer of the DRM GPU Scheduler
+
 N: Simmule Turner
 E: [email protected]
 D: Added swapping to filesystem
@@ -4339,7 +4341,7 @@ D: Freescale Highspeed USB device driver
 D: Freescale QE SoC support and Ethernet driver
 S: B-1206 Jingmao Guojigongyu
 S: 16 Baliqiao Nanjie, Beijing 101100
-S: People's Repulic of China
+S: People's Republic of China
 
 N: Vlad Yasevich
 E: [email protected]

Documentation/ABI/testing/sysfs-class-cxl renamed to Documentation/ABI/obsolete/sysfs-class-cxl

@@ -1,3 +1,6 @@
+The cxl driver is no longer maintained, and will be removed from the kernel in
+the near future.
+
 Please note that attributes that are shared between devices are stored in
 the directory pointed to by the symlink device/.
 For example, the real path of the attribute /sys/class/cxl/afu0.0s/irqs_max is

Documentation/ABI/stable/sysfs-class-bluetooth

@@ -0,0 +1,9 @@
+What: 		/sys/class/bluetooth/hci<index>/reset
+Date:		14-Jan-2025
+KernelVersion:	6.13
+Contact:	[email protected]
+Description: 	This write-only attribute allows users to trigger the vendor reset
+		method on the Bluetooth device when arbitrary data is written.
+		The reset may or may not be done through the device transport
+		(e.g., UART/USB), and can also be done through an out-of-band
+		approach such as GPIO.

Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-source

@@ -0,0 +1,15 @@
+What:		/sys/bus/coresight/devices/dummy_source<N>/enable_source
+Date:		Dec 2024
+KernelVersion:	6.14
+Contact:	Mao Jinlong <[email protected]>
+Description:	(RW) Enable/disable tracing of dummy source. A sink should be activated
+		before enabling the source. The path of coresight components linking
+		the source to the sink is configured and managed automatically by the
+		coresight framework.
+
+What:		/sys/bus/coresight/devices/dummy_source<N>/traceid
+Date:		Dec 2024
+KernelVersion:	6.14
+Contact:	Mao Jinlong <[email protected]>
+Description:	(R) Show the trace ID that will appear in the trace stream
+		coming from this trace entity.

Documentation/ABI/testing/sysfs-bus-event_source-devices

@@ -0,0 +1,24 @@
+What: /sys/bus/event_source/devices/<pmu>
+Date: 2014/02/24
+Contact:	Linux kernel mailing list <[email protected]>
+Description:	Performance Monitoring Unit (<pmu>)
+
+		Each <pmu> directory, for a PMU device, is a name
+		optionally followed by an underscore and then either a
+		decimal or hexadecimal number. For example, cpu is a
+		PMU name without a suffix as is intel_bts,
+		uncore_imc_0 is a PMU name with a 0 numeric suffix,
+		ddr_pmu_87e1b0000000 is a PMU name with a hex
+		suffix. The hex suffix must be more than two
+		characters long to avoid ambiguity with PMUs like the
+		S390 cpum_cf.
+
+		Tools can treat PMUs with the same name that differ by
+		suffix as instances of the same PMU for the sake of,
+		for example, opening an event. For example, the PMUs
+		uncore_imc_free_running_0 and
+		uncore_imc_free_running_1 have an event data_read;
+		opening the data_read event on a PMU specified as
+		uncore_imc_free_running should be treated as opening
+		the data_read event on PMU uncore_imc_free_running_0
+		and PMU uncore_imc_free_running_1.

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

@@ -37,11 +37,13 @@ Description:	Per-pmu performance monitoring events specific to the running syste
 		performance monitoring event supported by the <pmu>. The name
 		of the file is the name of the event.
 
-		As performance monitoring event names are case
-		insensitive in the perf tool, the perf tool only looks
-		for lower or upper case event names in sysfs to avoid
+		As performance monitoring event names are case insensitive
+		in the perf tool, the perf tool only looks for all lower
+		case or all upper case event names in sysfs to avoid
 		scanning the directory. It is therefore required the
-		name of the event here is either lower or upper case.
+		name of the event here is either completely lower or upper
+		case, with no mixed-case characters. Numbers, '.', '_', and
+		'-' are also allowed.
 
 		File contents: