Skip to content

Commit 177bce6

Browse files
robclarkrobclark
committed
Merge tag 'drm-misc-next-2024-02-29' into msm-next
Merge to pick up commit 47f419e ("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: Rob Clark <robdclark@chromium.org>
2 parents 1839751 + 8df1ddb commit 177bce6

File tree

1,895 files changed

+53388
-13685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,895 files changed

+53388
-13685
lines changed

‎.mailmap

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,11 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
191191
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
192192
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
193193
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
194-
Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>
195-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>
196-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>
197-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>
194+
Geliang Tang <geliang@kernel.org> <geliang.tang@linux.dev>
195+
Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>
196+
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>
197+
Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>
198+
Geliang Tang <geliang@kernel.org> <geliangtang@163.com>
198199
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
199200
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
200201
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
@@ -289,6 +290,7 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
289290
John Crispin <john@phrozen.org> <blogic@openwrt.org>
290291
John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>
291292
John Keeping <john@keeping.me.uk> <john@metanate.com>
293+
John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>
292294
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
293295
John Stultz <johnstul@us.ibm.com>
294296
<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -344,6 +346,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
344346
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
345347
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
346348
Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
349+
Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>
347350
Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>
348351
Linas Vepstas <linas@austin.ibm.com>
349352
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>
550553
Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
551554
Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
552555
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
556+
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
553557
Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
554558
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>
555559
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
What: /sys/class/<iface>/statistics/collisions
1+
What: /sys/class/net/<iface>/statistics/collisions
22
Date: April 2005
33
KernelVersion: 2.6.12
44
Contact: netdev@vger.kernel.org
55
Description:
66
Indicates the number of collisions seen by this network device.
77
This value might not be relevant with all MAC layers.
88

9-
What: /sys/class/<iface>/statistics/multicast
9+
What: /sys/class/net/<iface>/statistics/multicast
1010
Date: April 2005
1111
KernelVersion: 2.6.12
1212
Contact: netdev@vger.kernel.org
1313
Description:
1414
Indicates the number of multicast packets received by this
1515
network device.
1616

17-
What: /sys/class/<iface>/statistics/rx_bytes
17+
What: /sys/class/net/<iface>/statistics/rx_bytes
1818
Date: April 2005
1919
KernelVersion: 2.6.12
2020
Contact: netdev@vger.kernel.org
@@ -23,7 +23,7 @@ Description:
2323
See the network driver for the exact meaning of when this
2424
value is incremented.
2525

26-
What: /sys/class/<iface>/statistics/rx_compressed
26+
What: /sys/class/net/<iface>/statistics/rx_compressed
2727
Date: April 2005
2828
KernelVersion: 2.6.12
2929
Contact: netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description:
3232
network device. This value might only be relevant for interfaces
3333
that support packet compression (e.g: PPP).
3434

35-
What: /sys/class/<iface>/statistics/rx_crc_errors
35+
What: /sys/class/net/<iface>/statistics/rx_crc_errors
3636
Date: April 2005
3737
KernelVersion: 2.6.12
3838
Contact: netdev@vger.kernel.org
@@ -41,7 +41,7 @@ Description:
4141
by this network device. Note that the specific meaning might
4242
depend on the MAC layer used by the interface.
4343

44-
What: /sys/class/<iface>/statistics/rx_dropped
44+
What: /sys/class/net/<iface>/statistics/rx_dropped
4545
Date: April 2005
4646
KernelVersion: 2.6.12
4747
Contact: netdev@vger.kernel.org
@@ -51,15 +51,15 @@ Description:
5151
packet processing. See the network driver for the exact
5252
meaning of this value.
5353

54-
What: /sys/class/<iface>/statistics/rx_errors
54+
What: /sys/class/net/<iface>/statistics/rx_errors
5555
Date: April 2005
5656
KernelVersion: 2.6.12
5757
Contact: netdev@vger.kernel.org
5858
Description:
5959
Indicates the number of receive errors on this network device.
6060
See the network driver for the exact meaning of this value.
6161

62-
What: /sys/class/<iface>/statistics/rx_fifo_errors
62+
What: /sys/class/net/<iface>/statistics/rx_fifo_errors
6363
Date: April 2005
6464
KernelVersion: 2.6.12
6565
Contact: netdev@vger.kernel.org
@@ -68,7 +68,7 @@ Description:
6868
network device. See the network driver for the exact
6969
meaning of this value.
7070

71-
What: /sys/class/<iface>/statistics/rx_frame_errors
71+
What: /sys/class/net/<iface>/statistics/rx_frame_errors
7272
Date: April 2005
7373
KernelVersion: 2.6.12
7474
Contact: netdev@vger.kernel.org
@@ -78,7 +78,7 @@ Description:
7878
on the MAC layer protocol used. See the network driver for
7979
the exact meaning of this value.
8080

81-
What: /sys/class/<iface>/statistics/rx_length_errors
81+
What: /sys/class/net/<iface>/statistics/rx_length_errors
8282
Date: April 2005
8383
KernelVersion: 2.6.12
8484
Contact: netdev@vger.kernel.org
@@ -87,7 +87,7 @@ Description:
8787
error, oversized or undersized. See the network driver for the
8888
exact meaning of this value.
8989

90-
What: /sys/class/<iface>/statistics/rx_missed_errors
90+
What: /sys/class/net/<iface>/statistics/rx_missed_errors
9191
Date: April 2005
9292
KernelVersion: 2.6.12
9393
Contact: netdev@vger.kernel.org
@@ -96,15 +96,15 @@ Description:
9696
due to lack of capacity in the receive side. See the network
9797
driver for the exact meaning of this value.
9898

99-
What: /sys/class/<iface>/statistics/rx_nohandler
99+
What: /sys/class/net/<iface>/statistics/rx_nohandler
100100
Date: February 2016
101101
KernelVersion: 4.6
102102
Contact: netdev@vger.kernel.org
103103
Description:
104104
Indicates the number of received packets that were dropped on
105105
an inactive device by the network core.
106106

107-
What: /sys/class/<iface>/statistics/rx_over_errors
107+
What: /sys/class/net/<iface>/statistics/rx_over_errors
108108
Date: April 2005
109109
KernelVersion: 2.6.12
110110
Contact: netdev@vger.kernel.org
@@ -114,15 +114,15 @@ Description:
114114
(e.g: larger than MTU). See the network driver for the exact
115115
meaning of this value.
116116

117-
What: /sys/class/<iface>/statistics/rx_packets
117+
What: /sys/class/net/<iface>/statistics/rx_packets
118118
Date: April 2005
119119
KernelVersion: 2.6.12
120120
Contact: netdev@vger.kernel.org
121121
Description:
122122
Indicates the total number of good packets received by this
123123
network device.
124124

125-
What: /sys/class/<iface>/statistics/tx_aborted_errors
125+
What: /sys/class/net/<iface>/statistics/tx_aborted_errors
126126
Date: April 2005
127127
KernelVersion: 2.6.12
128128
Contact: netdev@vger.kernel.org
@@ -132,7 +132,7 @@ Description:
132132
a medium collision). See the network driver for the exact
133133
meaning of this value.
134134

135-
What: /sys/class/<iface>/statistics/tx_bytes
135+
What: /sys/class/net/<iface>/statistics/tx_bytes
136136
Date: April 2005
137137
KernelVersion: 2.6.12
138138
Contact: netdev@vger.kernel.org
@@ -143,7 +143,7 @@ Description:
143143
transmitted packets or all packets that have been queued for
144144
transmission.
145145

146-
What: /sys/class/<iface>/statistics/tx_carrier_errors
146+
What: /sys/class/net/<iface>/statistics/tx_carrier_errors
147147
Date: April 2005
148148
KernelVersion: 2.6.12
149149
Contact: netdev@vger.kernel.org
@@ -152,7 +152,7 @@ Description:
152152
because of carrier errors (e.g: physical link down). See the
153153
network driver for the exact meaning of this value.
154154

155-
What: /sys/class/<iface>/statistics/tx_compressed
155+
What: /sys/class/net/<iface>/statistics/tx_compressed
156156
Date: April 2005
157157
KernelVersion: 2.6.12
158158
Contact: netdev@vger.kernel.org
@@ -161,7 +161,7 @@ Description:
161161
this might only be relevant for devices that support
162162
compression (e.g: PPP).
163163

164-
What: /sys/class/<iface>/statistics/tx_dropped
164+
What: /sys/class/net/<iface>/statistics/tx_dropped
165165
Date: April 2005
166166
KernelVersion: 2.6.12
167167
Contact: netdev@vger.kernel.org
@@ -170,7 +170,7 @@ Description:
170170
See the driver for the exact reasons as to why the packets were
171171
dropped.
172172

173-
What: /sys/class/<iface>/statistics/tx_errors
173+
What: /sys/class/net/<iface>/statistics/tx_errors
174174
Date: April 2005
175175
KernelVersion: 2.6.12
176176
Contact: netdev@vger.kernel.org
@@ -179,7 +179,7 @@ Description:
179179
a network device. See the driver for the exact reasons as to
180180
why the packets were dropped.
181181

182-
What: /sys/class/<iface>/statistics/tx_fifo_errors
182+
What: /sys/class/net/<iface>/statistics/tx_fifo_errors
183183
Date: April 2005
184184
KernelVersion: 2.6.12
185185
Contact: netdev@vger.kernel.org
@@ -188,7 +188,7 @@ Description:
188188
FIFO error. See the driver for the exact reasons as to why the
189189
packets were dropped.
190190

191-
What: /sys/class/<iface>/statistics/tx_heartbeat_errors
191+
What: /sys/class/net/<iface>/statistics/tx_heartbeat_errors
192192
Date: April 2005
193193
KernelVersion: 2.6.12
194194
Contact: netdev@vger.kernel.org
@@ -197,7 +197,7 @@ Description:
197197
reported as heartbeat errors. See the driver for the exact
198198
reasons as to why the packets were dropped.
199199

200-
What: /sys/class/<iface>/statistics/tx_packets
200+
What: /sys/class/net/<iface>/statistics/tx_packets
201201
Date: April 2005
202202
KernelVersion: 2.6.12
203203
Contact: netdev@vger.kernel.org
@@ -206,7 +206,7 @@ Description:
206206
device. See the driver for whether this reports the number of all
207207
attempted or successful transmissions.
208208

209-
What: /sys/class/<iface>/statistics/tx_window_errors
209+
What: /sys/class/net/<iface>/statistics/tx_window_errors
210210
Date: April 2005
211211
KernelVersion: 2.6.12
212212
Contact: netdev@vger.kernel.org

‎Documentation/ABI/testing/sysfs-nvmem-cells

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ KernelVersion: 6.5
44
Contact: Miquel Raynal <miquel.raynal@bootlin.com>
55
Description:
66
The "cells" folder contains one file per cell exposed by the
7-
NVMEM device. The name of the file is: <name>@<where>, with
8-
<name> being the cell name and <where> its location in the NVMEM
9-
device, in hexadecimal (without the '0x' prefix, to mimic device
10-
tree node names). The length of the file is the size of the cell
11-
(when known). The content of the file is the binary content of
12-
the cell (may sometimes be ASCII, likely without trailing
13-
character).
7+
NVMEM device. The name of the file is: "<name>@<byte>,<bit>",
8+
with <name> being the cell name and <where> its location in
9+
the NVMEM device, in hexadecimal bytes and bits (without the
10+
'0x' prefix, to mimic device tree node names). The length of
11+
the file is the size of the cell (when known). The content of
12+
the file is the binary content of the cell (may sometimes be
13+
ASCII, likely without trailing character).
1414
Note: This file is only present if CONFIG_NVMEM_SYSFS
1515
is enabled.
1616

1717
Example::
1818

19-
hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d
19+
hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d,0
2020
00000000 54 4e 34 38 4d 2d 50 2d 44 4e |TN48M-P-DN|
2121
0000000a

‎Documentation/admin-guide/edid.rst

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,4 @@ restrictions later on.
2424
As a remedy for such situations, the kernel configuration item
2525
CONFIG_DRM_LOAD_EDID_FIRMWARE was introduced. It allows to provide an
2626
individually prepared or corrected EDID data set in the /lib/firmware
27-
directory from where it is loaded via the firmware interface. The code
28-
(see drivers/gpu/drm/drm_edid_load.c) contains built-in data sets for
29-
commonly used screen resolutions (800x600, 1024x768, 1280x1024, 1600x1200,
30-
1680x1050, 1920x1080) as binary blobs, but the kernel source tree does
31-
not contain code to create these data. In order to elucidate the origin
32-
of the built-in binary EDID blobs and to facilitate the creation of
33-
individual data for a specific misbehaving monitor, commented sources
34-
and a Makefile environment are given here.
35-
36-
To create binary EDID and C source code files from the existing data
37-
material, simply type "make" in tools/edid/.
38-
39-
If you want to create your own EDID file, copy the file 1024x768.S,
40-
replace the settings with your own data and add a new target to the
41-
Makefile. Please note that the EDID data structure expects the timing
42-
values in a different way as compared to the standard X11 format.
43-
44-
X11:
45-
HTimings:
46-
hdisp hsyncstart hsyncend htotal
47-
VTimings:
48-
vdisp vsyncstart vsyncend vtotal
49-
50-
EDID::
51-
52-
#define XPIX hdisp
53-
#define XBLANK htotal-hdisp
54-
#define XOFFSET hsyncstart-hdisp
55-
#define XPULSE hsyncend-hsyncstart
56-
57-
#define YPIX vdisp
58-
#define YBLANK vtotal-vdisp
59-
#define YOFFSET vsyncstart-vdisp
60-
#define YPULSE vsyncend-vsyncstart
27+
directory from where it is loaded via the firmware interface.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,16 +1162,10 @@
11621162
panels may send no or incorrect EDID data sets.
11631163
This parameter allows to specify an EDID data sets
11641164
in the /lib/firmware directory that are used instead.
1165-
Generic built-in EDID data sets are used, if one of
1166-
edid/1024x768.bin, edid/1280x1024.bin,
1167-
edid/1680x1050.bin, or edid/1920x1080.bin is given
1168-
and no file with the same name exists. Details and
1169-
instructions how to build your own EDID data are
1170-
available in Documentation/admin-guide/edid.rst. An EDID
1171-
data set will only be used for a particular connector,
1172-
if its name and a colon are prepended to the EDID
1173-
name. Each connector may use a unique EDID data
1174-
set by separating the files with a comma. An EDID
1165+
An EDID data set will only be used for a particular
1166+
connector, if its name and a colon are prepended to
1167+
the EDID name. Each connector may use a unique EDID
1168+
data set by separating the files with a comma. An EDID
11751169
data set with no connector name will be used for
11761170
any connectors not explicitly specified.
11771171

‎Documentation/arch/arm64/silicon-errata.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,10 @@ stable kernels.
243243
+----------------+-----------------+-----------------+-----------------------------+
244244
| ASR | ASR8601 | #8601001 | N/A |
245245
+----------------+-----------------+-----------------+-----------------------------+
246+
+----------------+-----------------+-----------------+-----------------------------+
247+
| Microsoft | Azure Cobalt 100| #2139208 | ARM64_ERRATUM_2139208 |
248+
+----------------+-----------------+-----------------+-----------------------------+
249+
| Microsoft | Azure Cobalt 100| #2067961 | ARM64_ERRATUM_2067961 |
250+
+----------------+-----------------+-----------------+-----------------------------+
251+
| Microsoft | Azure Cobalt 100| #2253138 | ARM64_ERRATUM_2253138 |
252+
+----------------+-----------------+-----------------+-----------------------------+

0 commit comments

Comments
 (0)