Skip to content

Commit 8f109f2

Browse files
committed
Merge drm/drm-next into drm-xe-next
A backmerge to get the PMT preparation work for merging the BMG PMT support. Signed-off-by: Rodrigo Vivi <[email protected]>
2 parents 5425472 + 40384c8 commit 8f109f2

File tree

12,895 files changed

+501072
-332132
lines changed

Some content is hidden

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

12,895 files changed

+501072
-332132
lines changed

.clippy.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
check-private-items = true
4+
5+
disallowed-macros = [
6+
# The `clippy::dbg_macro` lint only works with `std::dbg!`, thus we simulate
7+
# it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.
8+
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool" },
9+
]

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Alan Cox <[email protected]>
33
Christoph Hellwig <[email protected]>
44
Jeff Kirsher <[email protected]>
55
Marc Gonzalez <[email protected]>
6+
Ralf Baechle <[email protected]>

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ modules.order
103103
# We don't want to ignore the following even if they are dot-files
104104
#
105105
!.clang-format
106+
!.clippy.toml
106107
!.cocciconfig
107108
!.editorconfig
108109
!.get_maintainer.ignore
@@ -128,6 +129,7 @@ series
128129

129130
# ctags files
130131
tags
132+
!tags/
131133
TAGS
132134

133135
# cscope files

.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
3737
Alexei Starovoitov <[email protected]> <[email protected]>
3838
Alexei Starovoitov <[email protected]> <[email protected]>
3939
Alexei Starovoitov <[email protected]> <[email protected]>
40+
4041
4142
Alex Elder <[email protected]>
4243
@@ -251,6 +252,8 @@ Guru Das Srinagesh <[email protected]> <[email protected]>
251252
Gustavo Padovan <[email protected]>
252253
Gustavo Padovan <[email protected]>
253254
255+
256+
254257
255258
256259
@@ -269,6 +272,7 @@ Jack Pham <[email protected]> <[email protected]>
269272
270273
271274
275+
272276
273277
James Bottomley <jejb@mulgrave.(none)>
274278
James Bottomley <[email protected]>
@@ -665,6 +669,7 @@ Tomeu Vizoso <[email protected]> <[email protected]>
665669
Thomas Graf <[email protected]>
666670
667671
Thomas Pedersen <[email protected]>
672+
668673
669674
670675
@@ -729,6 +734,7 @@ Will Deacon <[email protected]> <[email protected]>
729734
730735
731736
737+
732738
Yusuke Goda <[email protected]>
733739
734740

CREDITS

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3
185185
D: Linux/MIPS port
186186
D: Linux/68k hacker
187187
D: AX25 maintainer
188+
D: EDAC-CAVIUM OCTEON maintainer
189+
D: IOC3 ETHERNET DRIVER maintainer
190+
D: NETROM NETWORK LAYER maintainer
191+
D: ROSE NETWORK LAYER maintainer
192+
D: TURBOCHANNEL SUBSYSTEM maintainer
188193
S: Hauptstrasse 19
189194
S: 79837 St. Blasien
190195
S: Germany
@@ -574,6 +579,9 @@ N: Zach Brown
574579
575580
D: maestro pci sound
576581

582+
N: Zefan Li
583+
D: Contribution to control group stuff
584+
577585
N: David Brownell
578586
D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
579587
D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
@@ -1204,6 +1212,10 @@ S: Dreisbachstrasse 24
12041212
S: D-57250 Netphen
12051213
S: Germany
12061214

1215+
N: Florian Fainelli
1216+
1217+
D: DSA
1218+
12071219
N: Rik Faith
12081220
12091221
D: Future Domain TMC-16x0 SCSI driver (author)
@@ -3791,6 +3803,10 @@ S: Department of Zoology, University of Washington
37913803
S: Seattle, WA 98195-1800
37923804
S: USA
37933805

3806+
N: York Sun
3807+
3808+
D: Freescale DDR EDAC
3809+
37943810
N: Eugene Surovegin
37953811
37963812
W: https://kernel.ebshome.net/
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/fs/selinux/user
2+
Date: April 2005 (predates git)
3+
KernelVersion: 2.6.12-rc2 (predates git)
4+
5+
Description:
6+
7+
The selinuxfs "user" node allows userspace to request a list
8+
of security contexts that can be reached for a given SELinux
9+
user from a given starting context. This was used by libselinux
10+
when various login-style programs requested contexts for
11+
users, but libselinux stopped using it in 2020.
12+
Kernel support will be removed no sooner than Dec 2025.

Documentation/ABI/stable/sysfs-block

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,13 @@ Description:
424424
[RW] This file is used to control (on/off) the iostats
425425
accounting of the disk.
426426

427+
What: /sys/block/<disk>/queue/iostats_passthrough
428+
Date: October 2024
429+
430+
Description:
431+
[RW] This file is used to control (on/off) the iostats
432+
accounting of the disk for passthrough commands.
433+
427434

428435
What: /sys/block/<disk>/queue/logical_block_size
429436
Date: May 2009
@@ -594,6 +601,9 @@ Description:
594601
[RW] Maximum number of kilobytes to read-ahead for filesystems
595602
on this block device.
596603

604+
For MADV_HUGEPAGE, the readahead size may exceed this setting
605+
since its granularity is based on the hugepage size.
606+
597607

598608
What: /sys/block/<disk>/queue/rotational
599609
Date: January 2009

Documentation/ABI/testing/configfs-usb-gadget-uvc

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,70 @@ Description: Specific uncompressed frame descriptors
342342
support
343343
========================= =====================================
344344

345+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased
346+
Date: Sept 2024
347+
KernelVersion: 5.15
348+
Description: Framebased format descriptors
349+
350+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name
351+
Date: Sept 2024
352+
KernelVersion: 5.15
353+
Description: Specific framebased format descriptors
354+
355+
================== =======================================
356+
bFormatIndex unique id for this format descriptor;
357+
only defined after parent header is
358+
linked into the streaming class;
359+
read-only
360+
bmaControls this format's data for bmaControls in
361+
the streaming header
362+
bmInterlaceFlags specifies interlace information,
363+
read-only
364+
bAspectRatioY the X dimension of the picture aspect
365+
ratio, read-only
366+
bAspectRatioX the Y dimension of the picture aspect
367+
ratio, read-only
368+
bDefaultFrameIndex optimum frame index for this stream
369+
bBitsPerPixel number of bits per pixel used to
370+
specify color in the decoded video
371+
frame
372+
guidFormat globally unique id used to identify
373+
stream-encoding format
374+
================== =======================================
375+
376+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name/name
377+
Date: Sept 2024
378+
KernelVersion: 5.15
379+
Description: Specific framebased frame descriptors
380+
381+
========================= =====================================
382+
bFrameIndex unique id for this framedescriptor;
383+
only defined after parent format is
384+
linked into the streaming header;
385+
read-only
386+
dwFrameInterval indicates how frame interval can be
387+
programmed; a number of values
388+
separated by newline can be specified
389+
dwDefaultFrameInterval the frame interval the device would
390+
like to use as default
391+
dwBytesPerLine Specifies the number of bytes per line
392+
of video for packed fixed frame size
393+
formats, allowing the receiver to
394+
perform stride alignment of the video.
395+
If the bVariableSize value (above) is
396+
TRUE (1), or if the format does not
397+
permit such alignment, this value shall
398+
be set to zero (0).
399+
dwMaxBitRate the maximum bit rate at the shortest
400+
frame interval in bps
401+
dwMinBitRate the minimum bit rate at the longest
402+
frame interval in bps
403+
wHeight height of decoded bitmap frame in px
404+
wWidth width of decoded bitmam frame in px
405+
bmCapabilities still image support, fixed frame-rate
406+
support
407+
========================= =====================================
408+
345409
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header
346410
Date: Dec 2014
347411
KernelVersion: 4.0

Documentation/ABI/testing/debugfs-hisi-hpre

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,10 @@ Date: Apr 2020
184184
185185
Description: Dump the total number of time out requests.
186186
Available for both PF and VF, and take no other effect on HPRE.
187+
188+
What: /sys/kernel/debug/hisi_hpre/<bdf>/cap_regs
189+
Date: Oct 2024
190+
191+
Description: Dump the values of the qm and hpre capability bit registers and
192+
support the query of device specifications to facilitate fault locating.
193+
Available for both PF and VF, and take no other effect on HPRE.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/dev_data
2+
Date: Jan 2025
3+
KernelVersion: 6.13
4+
Contact: Longfang Liu <[email protected]>
5+
Description: Read the configuration data and some status data
6+
required for device live migration. These data include device
7+
status data, queue configuration data, some task configuration
8+
data and device attribute data. The output format of the data
9+
is defined by the live migration driver.
10+
11+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/migf_data
12+
Date: Jan 2025
13+
KernelVersion: 6.13
14+
Contact: Longfang Liu <[email protected]>
15+
Description: Read the data from the last completed live migration.
16+
This data includes the same device status data as in "dev_data".
17+
The migf_data is the dev_data that is migrated.
18+
19+
What: /sys/kernel/debug/vfio/<device>/migration/hisi_acc/cmd_state
20+
Date: Jan 2025
21+
KernelVersion: 6.13
22+
Contact: Longfang Liu <[email protected]>
23+
Description: Used to obtain the device command sending and receiving
24+
channel status. Returns failure or success logs based on the
25+
results.

Documentation/ABI/testing/debugfs-hisi-sec

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,10 @@ Contact: [email protected]
157157
Description: Dump the total number of completed but marked error requests
158158
to be received.
159159
Available for both PF and VF, and take no other effect on SEC.
160+
161+
What: /sys/kernel/debug/hisi_sec2/<bdf>/cap_regs
162+
Date: Oct 2024
163+
164+
Description: Dump the values of the qm and sec capability bit registers and
165+
support the query of device specifications to facilitate fault locating.
166+
Available for both PF and VF, and take no other effect on SEC.

Documentation/ABI/testing/debugfs-hisi-zip

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,10 @@ Contact: [email protected]
158158
Description: Dump the total number of BD type error requests
159159
to be received.
160160
Available for both PF and VF, and take no other effect on ZIP.
161+
162+
What: /sys/kernel/debug/hisi_zip/<bdf>/cap_regs
163+
Date: Oct 2024
164+
165+
Description: Dump the values of the qm and zip capability bit registers and
166+
support the query of device specifications to facilitate fault locating.
167+
Available for both PF and VF, and take no other effect on ZIP.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/bus/event_source/devices/vpa_pmu/format
2+
Date: November 2024
3+
Contact: Linux on PowerPC Developer List <[email protected]>
4+
Description: Read-only. Attribute group to describe the magic bits
5+
that go into perf_event_attr.config for a particular pmu.
6+
(See ABI/testing/sysfs-bus-event_source-devices-format).
7+
8+
Each attribute under this group defines a bit range of the
9+
perf_event_attr.config. Supported attribute are listed
10+
below::
11+
12+
event = "config:0-31" - event ID
13+
14+
For example::
15+
16+
l1_to_l2_lat = "event=0x1"
17+
18+
What: /sys/bus/event_source/devices/vpa_pmu/events
19+
Date: November 2024
20+
Contact: Linux on PowerPC Developer List <[email protected]>
21+
Description: Read-only. Attribute group to describe performance monitoring
22+
events for the Virtual Processor Area events. Each attribute
23+
in this group describes a single performance monitoring event
24+
supported by vpa_pmu. The name of the file is the name of
25+
the event (See ABI/testing/sysfs-bus-event_source-devices-events).

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2268,6 +2268,30 @@ Description:
22682268
An example format is 16-bytes, 2-digits-per-byte, HEX-string
22692269
representing the sensor unique ID number.
22702270

2271+
What: /sys/bus/iio/devices/iio:deviceX/filter_type_available
2272+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_filter_mode_available
2273+
KernelVersion: 6.1
2274+
2275+
Description:
2276+
Reading returns a list with the possible filter modes. Options
2277+
for the attribute:
2278+
2279+
* "sinc3" - The digital sinc3 filter. Moderate 1st
2280+
conversion time. Good noise performance.
2281+
* "sinc4" - Sinc 4. Excellent noise performance. Long
2282+
1st conversion time.
2283+
* "sinc5" - The digital sinc5 filter. Excellent noise
2284+
performance
2285+
* "sinc4+sinc1" - Sinc4 + averaging by 8. Low 1st conversion
2286+
time.
2287+
* "sinc3+rej60" - Sinc3 + 60Hz rejection.
2288+
* "sinc3+sinc1" - Sinc3 + averaging by 8. Low 1st conversion
2289+
time.
2290+
* "sinc3+pf1" - Sinc3 + device specific Post Filter 1.
2291+
* "sinc3+pf2" - Sinc3 + device specific Post Filter 2.
2292+
* "sinc3+pf3" - Sinc3 + device specific Post Filter 3.
2293+
* "sinc3+pf4" - Sinc3 + device specific Post Filter 4.
2294+
22712295
What: /sys/.../events/in_proximity_thresh_either_runningperiod
22722296
KernelVersion: 6.6
22732297
@@ -2339,3 +2363,11 @@ KernelVersion: 6.10
23392363
23402364
Description:
23412365
The value of current sense resistor in Ohms.
2366+
2367+
What: /sys/.../iio:deviceX/in_attention_input
2368+
KernelVersion: 6.13
2369+
2370+
Description:
2371+
Value representing the user's attention to the system expressed
2372+
in units as percentage. This usually means if the user is
2373+
looking at the screen or not.

Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)