Skip to content

Commit c598d5e

Browse files
author
Thomas Zimmermann
committed
Merge drm/drm-next into drm-misc-next
Backmerging to forward to v6.16-rc1 Signed-off-by: Thomas Zimmermann <[email protected]>
2 parents 29a9b3a + 19272b3 commit c598d5e

File tree

11,627 files changed

+537512
-239655
lines changed

Some content is hidden

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

11,627 files changed

+537512
-239655
lines changed

.clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ check-private-items = true
77
disallowed-macros = [
88
# The `clippy::dbg_macro` lint only works with `std::dbg!`, thus we simulate
99
# it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.
10-
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool" },
10+
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool", allow-invalid = true },
1111
]

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
*.o
4141
*.o.*
4242
*.patch
43+
*.pyc
4344
*.rmeta
4445
*.rpm
4546
*.rsi

.mailmap

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Adam Radford <[email protected]>
2121
2222
Adrian Bunk <[email protected]>
2323
24-
24+
25+
2526
2627
2728
Aleksandar Markovic <[email protected]> <[email protected]>
@@ -102,10 +103,12 @@ Ard Biesheuvel <[email protected]> <[email protected]>
102103
Arnaud Patard <[email protected]>
103104
Arnd Bergmann <[email protected]>
104105
Arun Kumar Neelakantam <[email protected]> <[email protected]>
106+
105107
Ashok Raj Nagarajan <[email protected]> <[email protected]>
106108
107109
108-
110+
111+
109112
Avaneesh Kumar Dwivedi <[email protected]> <[email protected]>
110113
Axel Dyks <[email protected]>
111114
@@ -134,6 +137,7 @@ Ben Widawsky <[email protected]> <[email protected]>
134137
135138
Benjamin Tissoires <[email protected]> <[email protected]>
136139
Benjamin Tissoires <[email protected]> <[email protected]>
140+
137141
138142
139143
@@ -154,6 +158,9 @@ Brian King <[email protected]>
154158
155159
156160
161+
162+
163+
157164
158165
159166
@@ -312,6 +319,7 @@ Jan Glauber <[email protected]> <[email protected]>
312319
313320
314321
322+
315323
316324
317325
@@ -414,6 +422,8 @@ Krishna Manikandan <[email protected]> <[email protected]>
414422
Krzysztof Kozlowski <[email protected]> <[email protected]>
415423
Krzysztof Kozlowski <[email protected]> <[email protected]>
416424
Krzysztof Kozlowski <[email protected]> <[email protected]>
425+
Krzysztof Wilczyński <[email protected]> <[email protected]>
426+
Krzysztof Wilczyński <[email protected]> <[email protected]>
417427
418428
Kuninori Morimoto <[email protected]>
419429
@@ -447,13 +457,16 @@ Luca Ceresoli <[email protected]> <[email protected]>
447457
448458
449459
460+
461+
450462
451463
452464
Maharaja Kennadyrajan <[email protected]> <[email protected]>
453465
454466
455467
Manikanta Pubbisetty <[email protected]> <[email protected]>
456468
Manivannan Sadhasivam <[email protected]> <[email protected]>
469+
Manivannan Sadhasivam <[email protected]> <[email protected]>
457470
458471
459472
@@ -483,6 +496,7 @@ Matthias Fuchs <[email protected]> <[email protected]>
483496
484497
Matthieu CASTET <[email protected]>
485498
499+
Mattijs Korpershoek <[email protected]> <[email protected]>
486500
487501
488502
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
@@ -506,6 +520,7 @@ Mayuresh Janorkar <[email protected]>
506520
507521
508522
Michael Buesch <[email protected]>
523+
509524
510525
Michel Dänzer <[email protected]>
511526
Michel Lespinasse <[email protected]>
@@ -540,6 +555,8 @@ Naveen N Rao <[email protected]> <[email protected]>
540555
541556
542557
558+
559+
543560
Nguyen Anh Quynh <[email protected]>
544561
545562
@@ -585,6 +602,12 @@ Paul Mackerras <[email protected]> <[email protected]>
585602
586603
587604
605+
606+
607+
608+
609+
610+
588611
Pavankumar Kondeti <[email protected]> <[email protected]>
589612
Peter A Jonsson <[email protected]>
590613
Peter Oruba <[email protected]>
@@ -625,6 +648,8 @@ Richard Genoud <[email protected]> <[email protected]>
625648
626649
627650
651+
652+
628653
629654
630655
@@ -717,6 +742,7 @@ Sven Eckelmann <[email protected]> <[email protected]>
717742
718743
719744
745+
720746
Takashi YOSHII <[email protected]>
721747
Tamizh Chelvam Raja <[email protected]> <[email protected]>
722748
@@ -749,6 +775,7 @@ Tvrtko Ursulin <[email protected]> <[email protected]>
749775
750776
751777
Uwe Kleine-König <[email protected]>
778+
752779
Uwe Kleine-König <[email protected]>
753780
Uwe Kleine-König <[email protected]>
754781
Uwe Kleine-König <[email protected]>

.pylintrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[MASTER]
2+
init-hook='import sys; sys.path += ["scripts/lib/kdoc", "scripts/lib/abi"]'

CREDITS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2336,7 +2336,7 @@ D: Author of the dialog utility, foundation
23362336
D: for Menuconfig's lxdialog.
23372337

23382338
N: Christoph Lameter
2339-
2339+
23402340
D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
23412341
D: NUMA support, Slab allocators, Page migration
23422342
D: Scalability, Time subsystem

Documentation/ABI/stable/sysfs-block

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,21 @@ Description:
547547
[RO] Maximum size in bytes of a single element in a DMA
548548
scatter/gather list.
549549

550+
What: /sys/block/<disk>/queue/max_write_streams
551+
Date: November 2024
552+
553+
Description:
554+
[RO] Maximum number of write streams supported, 0 if not
555+
supported. If supported, valid values are 1 through
556+
max_write_streams, inclusive.
557+
558+
What: /sys/block/<disk>/queue/write_stream_granularity
559+
Date: November 2024
560+
561+
Description:
562+
[RO] Granularity of a write stream in bytes. The granularity
563+
of a write stream is the size that should be discarded or
564+
overwritten together to avoid write amplification in the device.
550565

551566
What: /sys/block/<disk>/queue/max_segments
552567
Date: March 2010

Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,3 +715,101 @@ Description: This file shows 1 in case the system reset happened due to the
715715
switch board.
716716

717717
The file is read only.
718+
719+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/global_wp_request
720+
Date: May 2025
721+
KernelVersion: 6.16
722+
Contact: Vadim Pasternak <[email protected]>
723+
Description: This file when written 1 activates request to allow access to
724+
the write protected flashes. Such request can be performed only
725+
for system equipped with BMC (Board Management Controller),
726+
which can grant access to protected flashes. In case BMC allows
727+
access - it will respond with "global_wp_response". BMC decides
728+
regarding time window of granted access. After granted window is
729+
expired, BMC will change value back to 0.
730+
Default value is 0.
731+
732+
The file is read/write.
733+
734+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/global_wp_response
735+
Date: May 2025
736+
KernelVersion: 6.16
737+
Contact: Vadim Pasternak <[email protected]>
738+
Description: This file, when set 1, indicates that access to protected
739+
flashes have been granted to host CPU by BMC.
740+
Default value is 0.
741+
742+
The file is read only.
743+
744+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/shutdown_unlock
745+
Date: May 2025
746+
KernelVersion: 6.16
747+
Contact: Vadim Pasternak <[email protected]>
748+
Description: When ASICs are getting overheated, system protection
749+
hardware mechanism enforces system reboot. After system
750+
reboot ASICs come up in locked state. To unlock ASICs,
751+
this file should be written 1
752+
Default value is 0.
753+
754+
The file is read/write.
755+
756+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/boot_progress
757+
Date: May 2025
758+
KernelVersion: 6.16
759+
Contact: Vadim Pasternak <[email protected]>
760+
Description: These files show the Data Process Unit board boot progress
761+
state. Valid states are:
762+
- 4 : OS starting.
763+
- 5 : OS running.
764+
- 6 : Low-Power Standby.
765+
766+
The file is read only.
767+
768+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/dpu_id
769+
Date: May 2025
770+
KernelVersion: 6.16
771+
Contact: Vadim Pasternak <[email protected]>
772+
Description: This file shows hardware Id of Data Process Unit board.
773+
774+
The file is read only.
775+
776+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/reset_aux_pwr_or_reload
777+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/reset_dpu_thermal
778+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/reset_from_main_board
779+
Date: May 2025
780+
KernelVersion: 6.16
781+
Contact: Vadim Pasternak <[email protected]>
782+
Description: These files expose the cause of the most recent reset of the Data
783+
Processing Unit (DPU) board. The possible causes are:
784+
- Power auxiliary outage or power reload.
785+
- Thermal shutdown.
786+
- Reset request from the main board.
787+
Value 1 in file means this is reset cause, 0 - otherwise. Only one of
788+
the above causes could be 1 at the same time, representing only last
789+
reset cause.
790+
791+
The files are read only.
792+
793+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/perst_rst
794+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/phy_rst
795+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/tpm_rst
796+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/usbphy_rst
797+
Date: May 2025
798+
KernelVersion: 6.16
799+
Contact: Vadim Pasternak <[email protected]>
800+
Description: These files allow to reset hardware components of Data Process
801+
Unit board. Respectively PCI, Ethernet PHY, TPM and USB PHY
802+
resets.
803+
Default values for all the attributes is 1. Writing 0 will
804+
cause reset of the related component.
805+
806+
The files are read/write.
807+
808+
What: /sys/devices/platform/mlxplat/i2c_mlxcpld.*/i2c-*/i2c-*/*-00**/mlxreg-io.*/hwmon/hwmon*/ufm_upgrade
809+
Date: May 2025
810+
KernelVersion: 6.16
811+
Contact: Vadim Pasternak <[email protected]>
812+
Description: These files show status of Unified Fabric Manager upgrade.
813+
state. 0 - means upgrade is done, 1 - otherwise.
814+
815+
The file is read only.
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
What: /sys/kernel/debug/alienware-wmi-<wmi_device_name>/system_description
2+
Date: March 2025
3+
KernelVersion: 6.15
4+
Contact: Kurt Borja <[email protected]>
5+
Description:
6+
This file exposes the raw ``system_description`` number reported
7+
by the WMAX device.
8+
9+
Only present on devices with the AWCC interface.
10+
11+
See Documentation/admin-guide/laptops/alienware-wmi.rst for
12+
details.
13+
14+
RO
15+
16+
What: /sys/kernel/debug/alienware-wmi-<wmi_device_name>/hwmon_data
17+
Date: March 2025
18+
KernelVersion: 6.15
19+
Contact: Kurt Borja <[email protected]>
20+
Description:
21+
This file exposes HWMON private data.
22+
23+
Includes fan sensor count, temperature sensor count, internal
24+
fan IDs and internal temp IDs.
25+
26+
See Documentation/admin-guide/laptops/alienware-wmi.rst for
27+
details.
28+
29+
RO
30+
31+
What: /sys/kernel/debug/alienware-wmi-<wmi_device_name>/pprof_data
32+
Date: March 2025
33+
KernelVersion: 6.15
34+
Contact: Kurt Borja <[email protected]>
35+
Description:
36+
This file exposes Platform Profile private data.
37+
38+
Includes internal mapping to platform profiles and thermal
39+
profile IDs.
40+
41+
See Documentation/admin-guide/laptops/alienware-wmi.rst for
42+
details.
43+
44+
RO
45+
46+
What: /sys/kernel/debug/alienware-wmi-<wmi_device_name>/gpio_ctl/total_gpios
47+
Date: May 2025
48+
KernelVersion: 6.16
49+
Contact: Kurt Borja <[email protected]>
50+
Description:
51+
Total number of GPIO pins reported by the device.
52+
53+
RO
54+
55+
What: /sys/kernel/debug/alienware-wmi-<wmi_device_name>/gpio_ctl/pinX
56+
Date: May 2025
57+
KernelVersion: 6.16
58+
Contact: Kurt Borja <[email protected]>
59+
Description:
60+
This file controls GPIO pin X status.
61+
62+
See Documentation/wmi/devices/alienware-wmi.rst for details.
63+
64+
RW

0 commit comments

Comments
 (0)