Commit c7c3c7b7 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

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



Sync with drm-misc and drm-intel-next for common APIs and refactors.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parents fb2551a0 b615b9c3
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ Amit Nischal <quic_anischal@quicinc.com> <anischal@codeaurora.org>
Andi Kleen <ak@linux.intel.com> <ak@suse.de>
Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
Andreas Herrmann <aherrman@de.ibm.com>
Andreas Hindborg <a.hindborg@kernel.org> <a.hindborg@samsung.com>
Andrej Shadura <andrew.shadura@collabora.co.uk>
Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>
Andrew Morton <akpm@linux-foundation.org>
@@ -166,6 +167,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
David Brownell <david-b@pacbell.net>
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -268,6 +270,7 @@ James Ketrenos <jketreno@io.(none)>
Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
@@ -353,6 +356,8 @@ Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
Koushik <raghavendra.koushik@neterion.com>
@@ -607,12 +612,17 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
Sibi Sankar <quic_sibis@quicinc.com> <sibis@codeaurora.org>
Sid Manning <quic_sidneym@quicinc.com> <sidneym@codeaurora.org>
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
Simona Vetter <simona.vetter@ffwll.ch> <daniel.vetter@ffwll.ch>
Simona Vetter <simona.vetter@ffwll.ch> <daniel.vetter@intel.com>
Simona Vetter <simona.vetter@ffwll.ch> <daniel@ffwll.ch>
Simona Vetter <simona.vetter@ffwll.ch> <daniel@biene.ffwll.ch>
Simon Horman <horms@kernel.org> <simon.horman@corigine.com>
Simon Horman <horms@kernel.org> <simon.horman@netronome.com>
Simon Kelley <simon@thekelleys.org.uk>
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>
Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be
		interrupt.

		This file switches between these two modes:
		- "mcu" makes the button press event be handled by the MCU to
		 - ``mcu`` makes the button press event be handled by the MCU to
		   change the LEDs panel intensity.
		- "cpu" makes the button press event be handled by the CPU.
		 - ``cpu`` makes the button press event be handled by the CPU.

		Format: %s.

+2 −1
Original line number Diff line number Diff line
@@ -562,7 +562,8 @@ Description: Control Symmetric Multi Threading (SMT)
			 ================ =========================================

			 If control status is "forceoff" or "notsupported" writes
			 are rejected.
			 are rejected. Note that enabling SMT on PowerPC skips
			 offline cores.

What:		/sys/devices/system/cpu/cpuX/power/energy_perf_bias
Date:		March 2019
+8 −0
Original line number Diff line number Diff line
@@ -75,3 +75,11 @@ Description: RO. Energy input of device or gt in microjoules.
		for the gt.

		Only supported for particular Intel i915 graphics platforms.

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/fan1_input
Date:		November 2024
KernelVersion:	6.12
Contact:	intel-gfx@lists.freedesktop.org
Description:	RO. Fan speed of device in RPM.

		Only supported for particular Intel i915 graphics platforms.
+18 −13
Original line number Diff line number Diff line
@@ -258,24 +258,29 @@ Description: (RW) When retrieving the PHC with the PTP SYS_OFFSET_EXTENDED
		the estimated point where the FPGA latches the PHC time.  This
		value may be changed by writing an unsigned integer.

What:		/sys/class/timecard/ocpN/ttyGNSS
What:		/sys/class/timecard/ocpN/ttyGNSS2
Date:		September 2021
What:		/sys/class/timecard/ocpN/tty
Date:		August 2024
Contact:	Vadim Fedorenko <vadim.fedorenko@linux.dev>
Description:	(RO) Directory containing the sysfs nodes for TTY attributes

What:		/sys/class/timecard/ocpN/tty/ttyGNSS
What:		/sys/class/timecard/ocpN/tty/ttyGNSS2
Date:		August 2024
Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>
Description:	These optional attributes link to the TTY serial ports
		associated with the GNSS devices.
Description:	(RO) These optional attributes contain names of the TTY serial
		ports associated with the GNSS devices.

What:		/sys/class/timecard/ocpN/ttyMAC
Date:		September 2021
What:		/sys/class/timecard/ocpN/tty/ttyMAC
Date:		August 2024
Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>
Description:	This optional attribute links to the TTY serial port
		associated with the Miniature Atomic Clock.
Description:	(RO) This optional attribute contains name of the TTY serial
		port associated with the Miniature Atomic Clock.

What:		/sys/class/timecard/ocpN/ttyNMEA
Date:		September 2021
What:		/sys/class/timecard/ocpN/tty/ttyNMEA
Date:		August 2024
Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>
Description:	This optional attribute links to the TTY serial port
		which outputs the PHC time in NMEA ZDA format.
Description:	(RO) This optional attribute contains name of the TTY serial
		port which outputs the PHC time in NMEA ZDA format.

What:		/sys/class/timecard/ocpN/utc_tai_offset
Date:		September 2021
Loading