Commit 177bce60 authored by Rob Clark's avatar Rob Clark
Browse files

Merge tag 'drm-misc-next-2024-02-29' into msm-next 



Merge to pick up commit 47f419e0 ("drm/dp: move
intel_dp_vsc_sdp_pack() to generic helper")

drm-misc-next for v6.9:

UAPI Changes:

Cross-subsystem Changes:

backlight:
- corgi: include backlight header

fbdev:
- Cleanup includes in public header file
- fbtft: Include backlight header

Core Changes:

edid:
- Remove built-in EDID data

dp:
- Avoid AUX transfers on powered-down displays
- Add VSC SDP helpers

modesetting:
- Add sanity checks for polling
- Cleanups

scheduler:
- Cleanups

tests:
- Add helpers for mode-setting tests

Driver Changes:

i915:
- Use shared VSC SDP helper

mgag200:
- Work around PCI write bursts

mxsfb:
- Use managed mode config

nouveau:
- Include backlight header where necessary

qiac:
- Cleanups

sun4:
- HDMI: updates to atomic mode setting

tegra:
- Fix GEM refounting in error paths

tidss:
- Fix multi display
- Fix initial Z position

v3d:
- Support display MMU page size

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parents 18397519 8df1ddb5

.mailmap

+8 −4
Original line number Diff line number Diff line
@@ -191,10 +191,11 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>

Geliang Tang <geliang@kernel.org> <geliang.tang@linux.dev>

Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>

Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>

Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>

Geliang Tang <geliang@kernel.org> <geliangtang@163.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
@@ -289,6 +290,7 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com> 
John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -344,6 +346,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>

Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>

Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>

Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>

Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
@@ -550,6 +553,7 @@ Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org> 
Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>

Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>

Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>

Documentation/ABI/testing/sysfs-class-net-statistics

+24 −24
Original line number Diff line number Diff line 
What:		/sys/class/<iface>/statistics/collisions

What:		/sys/class/net/<iface>/statistics/collisions

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -6,7 +6,7 @@ Description: 
		Indicates the number of collisions seen by this network device.

		This value might not be relevant with all MAC layers.



What:		/sys/class/<iface>/statistics/multicast

What:		/sys/class/net/<iface>/statistics/multicast

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -14,7 +14,7 @@ Description: 
		Indicates the number of multicast packets received by this

		network device.



What:		/sys/class/<iface>/statistics/rx_bytes

What:		/sys/class/net/<iface>/statistics/rx_bytes

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -23,7 +23,7 @@ Description: 
		See the network driver for the exact meaning of when this

		value is incremented.



What:		/sys/class/<iface>/statistics/rx_compressed

What:		/sys/class/net/<iface>/statistics/rx_compressed

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description: 
		network device. This value might only be relevant for interfaces

		that support packet compression (e.g: PPP).



What:		/sys/class/<iface>/statistics/rx_crc_errors

What:		/sys/class/net/<iface>/statistics/rx_crc_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -41,7 +41,7 @@ Description: 
		by this network device. Note that the specific meaning might

		depend on the MAC layer used by the interface.



What:		/sys/class/<iface>/statistics/rx_dropped

What:		/sys/class/net/<iface>/statistics/rx_dropped

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -51,7 +51,7 @@ Description: 
		packet processing. See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_errors

What:		/sys/class/net/<iface>/statistics/rx_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -59,7 +59,7 @@ Description: 
		Indicates the number of receive errors on this network device.

		See the network driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_fifo_errors

What:		/sys/class/net/<iface>/statistics/rx_fifo_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -68,7 +68,7 @@ Description: 
		network device. See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_frame_errors

What:		/sys/class/net/<iface>/statistics/rx_frame_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -78,7 +78,7 @@ Description: 
		on the MAC layer protocol used. See the network driver for

		the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_length_errors

What:		/sys/class/net/<iface>/statistics/rx_length_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -87,7 +87,7 @@ Description: 
		error, oversized or undersized. See the network driver for the

		exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_missed_errors

What:		/sys/class/net/<iface>/statistics/rx_missed_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -96,7 +96,7 @@ Description: 
		due to lack of capacity in the receive side. See the network

		driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_nohandler

What:		/sys/class/net/<iface>/statistics/rx_nohandler

Date:		February 2016

KernelVersion:	4.6

Contact:	netdev@vger.kernel.org
@@ -104,7 +104,7 @@ Description: 
		Indicates the number of received packets that were dropped on

		an inactive device by the network core.



What:		/sys/class/<iface>/statistics/rx_over_errors

What:		/sys/class/net/<iface>/statistics/rx_over_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -114,7 +114,7 @@ Description: 
		(e.g: larger than MTU). See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_packets

What:		/sys/class/net/<iface>/statistics/rx_packets

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -122,7 +122,7 @@ Description: 
		Indicates the total number of good packets received by this

		network device.



What:		/sys/class/<iface>/statistics/tx_aborted_errors

What:		/sys/class/net/<iface>/statistics/tx_aborted_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -132,7 +132,7 @@ Description: 
		a medium collision). See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/tx_bytes

What:		/sys/class/net/<iface>/statistics/tx_bytes

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -143,7 +143,7 @@ Description: 
		transmitted packets or all packets that have been queued for

		transmission.



What:		/sys/class/<iface>/statistics/tx_carrier_errors

What:		/sys/class/net/<iface>/statistics/tx_carrier_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -152,7 +152,7 @@ Description: 
		because of carrier errors (e.g: physical link down). See the

		network driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/tx_compressed

What:		/sys/class/net/<iface>/statistics/tx_compressed

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -161,7 +161,7 @@ Description: 
		this might only be relevant for devices that support

		compression (e.g: PPP).



What:		/sys/class/<iface>/statistics/tx_dropped

What:		/sys/class/net/<iface>/statistics/tx_dropped

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -170,7 +170,7 @@ Description: 
		See the driver for the exact reasons as to why the packets were

		dropped.



What:		/sys/class/<iface>/statistics/tx_errors

What:		/sys/class/net/<iface>/statistics/tx_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -179,7 +179,7 @@ Description: 
		a network device. See the driver for the exact reasons as to

		why the packets were dropped.



What:		/sys/class/<iface>/statistics/tx_fifo_errors

What:		/sys/class/net/<iface>/statistics/tx_fifo_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -188,7 +188,7 @@ Description: 
		FIFO error. See the driver for the exact reasons as to why the

		packets were dropped.



What:		/sys/class/<iface>/statistics/tx_heartbeat_errors

What:		/sys/class/net/<iface>/statistics/tx_heartbeat_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -197,7 +197,7 @@ Description: 
		reported as heartbeat errors. See the driver for the exact

		reasons as to why the packets were dropped.



What:		/sys/class/<iface>/statistics/tx_packets

What:		/sys/class/net/<iface>/statistics/tx_packets

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -206,7 +206,7 @@ Description: 
		device. See the driver for whether this reports the number of all

		attempted or successful transmissions.



What:		/sys/class/<iface>/statistics/tx_window_errors

What:		/sys/class/net/<iface>/statistics/tx_window_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org

Documentation/ABI/testing/sysfs-nvmem-cells

+8 −8
Original line number Diff line number Diff line
@@ -4,18 +4,18 @@ KernelVersion: 6.5 
Contact:	Miquel Raynal <miquel.raynal@bootlin.com>

Description:

		The "cells" folder contains one file per cell exposed by the

		NVMEM device. The name of the file is: <name>@<where>, with

		<name> being the cell name and <where> its location in the NVMEM

		device, in hexadecimal (without the '0x' prefix, to mimic device

		tree node names). The length of the file is the size of the cell

		(when known). The content of the file is the binary content of

		the cell (may sometimes be ASCII, likely without trailing

		character).

		NVMEM device. The name of the file is: "<name>@<byte>,<bit>",

		with <name> being the cell name and <where> its location in

		the NVMEM device, in hexadecimal bytes and bits (without the

		'0x' prefix, to mimic device tree node names). The length of

		the file is the size of the cell (when known). The content of

		the file is the binary content of the cell (may sometimes be

		ASCII, likely without trailing character).

		Note: This file is only present if CONFIG_NVMEM_SYSFS

		is enabled.



		Example::



		  hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d

		  hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d,0

		  00000000  54 4e 34 38 4d 2d 50 2d  44 4e         |TN48M-P-DN|

		  0000000a

Documentation/admin-guide/edid.rst

+1 −34
Original line number Diff line number Diff line
@@ -24,37 +24,4 @@ restrictions later on. 
As a remedy for such situations, the kernel configuration item

CONFIG_DRM_LOAD_EDID_FIRMWARE was introduced. It allows to provide an

individually prepared or corrected EDID data set in the /lib/firmware

directory from where it is loaded via the firmware interface. The code

(see drivers/gpu/drm/drm_edid_load.c) contains built-in data sets for

commonly used screen resolutions (800x600, 1024x768, 1280x1024, 1600x1200,

1680x1050, 1920x1080) as binary blobs, but the kernel source tree does

not contain code to create these data. In order to elucidate the origin

of the built-in binary EDID blobs and to facilitate the creation of

individual data for a specific misbehaving monitor, commented sources

and a Makefile environment are given here.



To create binary EDID and C source code files from the existing data

material, simply type "make" in tools/edid/.



If you want to create your own EDID file, copy the file 1024x768.S,

replace the settings with your own data and add a new target to the

Makefile. Please note that the EDID data structure expects the timing

values in a different way as compared to the standard X11 format.



X11:

  HTimings:

    hdisp hsyncstart hsyncend htotal

  VTimings:

    vdisp vsyncstart vsyncend vtotal



EDID::



  #define XPIX hdisp

  #define XBLANK htotal-hdisp

  #define XOFFSET hsyncstart-hdisp

  #define XPULSE hsyncend-hsyncstart



  #define YPIX vdisp

  #define YBLANK vtotal-vdisp

  #define YOFFSET vsyncstart-vdisp

  #define YPULSE vsyncend-vsyncstart
 
directory from where it is loaded via the firmware interface.

Documentation/admin-guide/kernel-parameters.txt

+4 −10
Original line number Diff line number Diff line
@@ -1162,16 +1162,10 @@ 
			panels may send no or incorrect EDID data sets.

			This parameter allows to specify an EDID data sets

			in the /lib/firmware directory that are used instead.

			Generic built-in EDID data sets are used, if one of

			edid/1024x768.bin, edid/1280x1024.bin,

			edid/1680x1050.bin, or edid/1920x1080.bin is given

			and no file with the same name exists. Details and

			instructions how to build your own EDID data are

			available in Documentation/admin-guide/edid.rst. An EDID

			data set will only be used for a particular connector,

			if its name and a colon are prepended to the EDID

			name. Each connector may use a unique EDID data

			set by separating the files with a comma.  An EDID

			An EDID data set will only be used for a particular

			connector, if its name and a colon are prepended to

			the EDID name. Each connector may use a unique EDID

			data set by separating the files with a comma. An EDID

			data set with no connector name will be used for

			any connectors not explicitly specified.