Commit b0a835db authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-next into drm-misc-next 



Backmerging to get DRM fixes from v6.9-rc6.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents e91a36b4 4a56c0ed

.mailmap

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,16 @@ Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com> 
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>

Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>

Alex Elder <elder@kernel.org>

Alex Elder <elder@kernel.org> <aelder@sgi.com>

Alex Elder <elder@kernel.org> <alex.elder@linaro.org>

Alex Elder <elder@kernel.org> <alex.elder@linary.org>

Alex Elder <elder@kernel.org> <elder@dreamhost.com>

Alex Elder <elder@kernel.org> <elder@dreawmhost.com>

Alex Elder <elder@kernel.org> <elder@ieee.org>

Alex Elder <elder@kernel.org> <elder@inktank.com>

Alex Elder <elder@kernel.org> <elder@linaro.org>

Alex Elder <elder@kernel.org> <elder@newdream.net>

Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>

Alex Shi <alexs@kernel.org> <alex.shi@intel.com>

Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
@@ -98,6 +108,8 @@ Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net> 
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>

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

+67 −27
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Description: RW. Card reactive sustained (PL1) power limit in microwatts. 
		power limit is disabled, writing 0 disables the

		limit. Writing values > 0 and <= TDP will enable the power limit.



		Only supported for particular Intel xe graphics platforms.

		Only supported for particular Intel Xe graphics platforms.



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

Date:		September 2023
@@ -18,53 +18,93 @@ KernelVersion: 6.5 
Contact:	intel-xe@lists.freedesktop.org

Description:	RO. Card default power limit (default TDP setting).



		Only supported for particular Intel xe graphics platforms.

		Only supported for particular Intel Xe graphics platforms.



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



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

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Card reactive critical (I1) power limit in microwatts.

Description:	RO. Card energy input of device in microjoules.



		Only supported for particular Intel Xe graphics platforms.



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

Date:		October 2023

KernelVersion:	6.6

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Card sustained power limit interval (Tau in PL1/Tau) in

		milliseconds over which sustained power is averaged.



		Only supported for particular Intel Xe graphics platforms.



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

Date:		February 2024

KernelVersion:	6.8

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Package reactive sustained  (PL1) power limit in microwatts.



		The power controller will throttle the operating frequency

		if the power averaged over a window (typically seconds)

		exceeds this limit. A read value of 0 means that the PL1

		power limit is disabled, writing 0 disables the

		limit. Writing values > 0 and <= TDP will enable the power limit.



		Only supported for particular Intel Xe graphics platforms.



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

Date:		February 2024

KernelVersion:	6.8

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. Package default power limit (default TDP setting).



		Card reactive critical (I1) power limit in microwatts is exposed

		Only supported for particular Intel Xe graphics platforms.



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

Date:		February 2024

KernelVersion:	6.8

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Package reactive critical (I1) power limit in microwatts.



		Package reactive critical (I1) power limit in microwatts is exposed

		for client products. The power controller will throttle the

		operating frequency if the power averaged over a window exceeds

		this limit.



		Only supported for particular Intel xe graphics platforms.

		Only supported for particular Intel Xe graphics platforms.



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

Date:		September 2023

KernelVersion:	6.5

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

Date:		February 2024

KernelVersion:	6.8

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Card reactive critical (I1) power limit in milliamperes.

Description:	RW. Package reactive critical (I1) power limit in milliamperes.



		Card reactive critical (I1) power limit in milliamperes is

		Package reactive critical (I1) power limit in milliamperes is

		exposed for server products. The power controller will throttle

		the operating frequency if the power averaged over a window

		exceeds this limit.



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

Date:		September 2023

KernelVersion:	6.5

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

Date:		February 2024

KernelVersion:	6.8

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. Current Voltage in millivolt.

Description:	RO. Package energy input of device in microjoules.



		Only supported for particular Intel xe graphics platforms.

		Only supported for particular Intel Xe graphics platforms.



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

Date:		September 2023

KernelVersion:	6.5

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

Date:		February 2024

KernelVersion:	6.8

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. Energy input of device in microjoules.

Description:	RW. Package sustained power limit interval (Tau in PL1/Tau) in

		milliseconds over which sustained power is averaged.



		Only supported for particular Intel xe graphics platforms.

		Only supported for particular Intel Xe graphics platforms.



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

Date:		October 2023

KernelVersion:	6.6

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

Date:		February 2024

KernelVersion:	6.8

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Sustained power limit interval (Tau in PL1/Tau) in

		milliseconds over which sustained power is averaged.

Description:	RO. Package current voltage in millivolt.



		Only supported for particular Intel xe graphics platforms.
 
		Only supported for particular Intel Xe graphics platforms.

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -3423,6 +3423,9 @@ 
			arch-independent options, each of which is an

			aggregation of existing arch-specific options.



			Note, "mitigations" is supported if and only if the

			kernel was built with CPU_MITIGATIONS=y.



			off

				Disable all optional CPU mitigations.  This

				improves system performance, but it may also

Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst

+417 −180

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
      - enum:

          - mediatek,mt8173-disp-gamma

          - mediatek,mt8183-disp-gamma

          - mediatek,mt8195-disp-gamma

      - items:

          - enum:

              - mediatek,mt6795-disp-gamma
@@ -35,6 +36,10 @@ properties: 
              - mediatek,mt8192-disp-gamma

              - mediatek,mt8195-disp-gamma

          - const: mediatek,mt8183-disp-gamma

      - items:

          - enum:

              - mediatek,mt8188-disp-gamma

          - const: mediatek,mt8195-disp-gamma



  reg:

    maxItems: 1