Skip to content

Commit 37ba6c7

Browse files
author
Maarten Lankhorst
committed
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes
A regression was caused by commit e4b5ccd ("drm/v3d: Ensure job pointer is set to NULL after job completion"), but this commit is not yet in next-fixes, fast-forward it. Try Rust-for-Linux#2, first one didn't have v6.13 in it. Signed-off-by: Maarten Lankhorst <[email protected]>
2 parents db8b2c0 + 07c5b27 commit 37ba6c7

File tree

472 files changed

+4396
-2636
lines changed

Some content is hidden

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

472 files changed

+4396
-2636
lines changed

.mailmap

+3
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ Ben Widawsky <[email protected]> <[email protected]>
121121
122122
Benjamin Tissoires <[email protected]> <[email protected]>
123123
Benjamin Tissoires <[email protected]> <[email protected]>
124+
125+
124126
125127
126128
@@ -200,6 +202,7 @@ Elliot Berman <[email protected]> <[email protected]>
200202
Enric Balletbo i Serra <[email protected]> <[email protected]>
201203
Enric Balletbo i Serra <[email protected]> <[email protected]>
202204
205+
Ethan Carter Edwards <[email protected]> Ethan Edwards <[email protected]>
203206
204207
205208
Evgeniy Polyakov <[email protected]>

CREDITS

+12
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ N: Thomas Abraham
2020
2121
D: Samsung pin controller driver
2222

23+
N: Jose Abreu
24+
25+
D: Synopsys DesignWare XPCS MDIO/PCS driver.
26+
2327
N: Dragos Acostachioaie
2428
2529
W: http://www.arbornet.org/~dragos
@@ -1428,6 +1432,10 @@ S: 8124 Constitution Apt. 7
14281432
S: Sterling Heights, Michigan 48313
14291433
S: USA
14301434

1435+
N: Andy Gospodarek
1436+
1437+
D: Maintenance and contributions to the network interface bonding driver.
1438+
14311439
N: Wolfgang Grandegger
14321440
14331441
D: Controller Area Network (device drivers)
@@ -1812,6 +1820,10 @@ D: Author/maintainer of most DRM drivers (especially ATI, MGA)
18121820
D: Core DRM templates, general DRM and 3D-related hacking
18131821
S: No fixed address
18141822

1823+
N: Woojung Huh
1824+
1825+
D: Microchip LAN78XX USB Ethernet driver
1826+
18151827
N: Kenn Humborg
18161828
18171829
D: Mods to loop device to support sparse backing files

Documentation/admin-guide/pm/cpuidle.rst

+31-41
Original file line numberDiff line numberDiff line change
@@ -269,27 +269,7 @@ Namely, when invoked to select an idle state for a CPU (i.e. an idle state that
269269
the CPU will ask the processor hardware to enter), it attempts to predict the
270270
idle duration and uses the predicted value for idle state selection.
271271

272-
It first obtains the time until the closest timer event with the assumption
273-
that the scheduler tick will be stopped. That time, referred to as the *sleep
274-
length* in what follows, is the upper bound on the time before the next CPU
275-
wakeup. It is used to determine the sleep length range, which in turn is needed
276-
to get the sleep length correction factor.
277-
278-
The ``menu`` governor maintains two arrays of sleep length correction factors.
279-
One of them is used when tasks previously running on the given CPU are waiting
280-
for some I/O operations to complete and the other one is used when that is not
281-
the case. Each array contains several correction factor values that correspond
282-
to different sleep length ranges organized so that each range represented in the
283-
array is approximately 10 times wider than the previous one.
284-
285-
The correction factor for the given sleep length range (determined before
286-
selecting the idle state for the CPU) is updated after the CPU has been woken
287-
up and the closer the sleep length is to the observed idle duration, the closer
288-
to 1 the correction factor becomes (it must fall between 0 and 1 inclusive).
289-
The sleep length is multiplied by the correction factor for the range that it
290-
falls into to obtain the first approximation of the predicted idle duration.
291-
292-
Next, the governor uses a simple pattern recognition algorithm to refine its
272+
It first uses a simple pattern recognition algorithm to obtain a preliminary
293273
idle duration prediction. Namely, it saves the last 8 observed idle duration
294274
values and, when predicting the idle duration next time, it computes the average
295275
and variance of them. If the variance is small (smaller than 400 square
@@ -301,29 +281,39 @@ Again, if the variance of them is small (in the above sense), the average is
301281
taken as the "typical interval" value and so on, until either the "typical
302282
interval" is determined or too many data points are disregarded, in which case
303283
the "typical interval" is assumed to equal "infinity" (the maximum unsigned
304-
integer value). The "typical interval" computed this way is compared with the
305-
sleep length multiplied by the correction factor and the minimum of the two is
306-
taken as the predicted idle duration.
307-
308-
Then, the governor computes an extra latency limit to help "interactive"
309-
workloads. It uses the observation that if the exit latency of the selected
310-
idle state is comparable with the predicted idle duration, the total time spent
311-
in that state probably will be very short and the amount of energy to save by
312-
entering it will be relatively small, so likely it is better to avoid the
313-
overhead related to entering that state and exiting it. Thus selecting a
314-
shallower state is likely to be a better option then. The first approximation
315-
of the extra latency limit is the predicted idle duration itself which
316-
additionally is divided by a value depending on the number of tasks that
317-
previously ran on the given CPU and now they are waiting for I/O operations to
318-
complete. The result of that division is compared with the latency limit coming
319-
from the power management quality of service, or `PM QoS <cpu-pm-qos_>`_,
320-
framework and the minimum of the two is taken as the limit for the idle states'
321-
exit latency.
284+
integer value).
285+
286+
If the "typical interval" computed this way is long enough, the governor obtains
287+
the time until the closest timer event with the assumption that the scheduler
288+
tick will be stopped. That time, referred to as the *sleep length* in what follows,
289+
is the upper bound on the time before the next CPU wakeup. It is used to determine
290+
the sleep length range, which in turn is needed to get the sleep length correction
291+
factor.
292+
293+
The ``menu`` governor maintains an array containing several correction factor
294+
values that correspond to different sleep length ranges organized so that each
295+
range represented in the array is approximately 10 times wider than the previous
296+
one.
297+
298+
The correction factor for the given sleep length range (determined before
299+
selecting the idle state for the CPU) is updated after the CPU has been woken
300+
up and the closer the sleep length is to the observed idle duration, the closer
301+
to 1 the correction factor becomes (it must fall between 0 and 1 inclusive).
302+
The sleep length is multiplied by the correction factor for the range that it
303+
falls into to obtain an approximation of the predicted idle duration that is
304+
compared to the "typical interval" determined previously and the minimum of
305+
the two is taken as the idle duration prediction.
306+
307+
If the "typical interval" value is small, which means that the CPU is likely
308+
to be woken up soon enough, the sleep length computation is skipped as it may
309+
be costly and the idle duration is simply predicted to equal the "typical
310+
interval" value.
322311

323312
Now, the governor is ready to walk the list of idle states and choose one of
324313
them. For this purpose, it compares the target residency of each state with
325-
the predicted idle duration and the exit latency of it with the computed latency
326-
limit. It selects the state with the target residency closest to the predicted
314+
the predicted idle duration and the exit latency of it with the with the latency
315+
limit coming from the power management quality of service, or `PM QoS <cpu-pm-qos_>`_,
316+
framework. It selects the state with the target residency closest to the predicted
327317
idle duration, but still below it, and exit latency that does not exceed the
328318
limit.
329319

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

+18-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ properties:
4242
interrupts:
4343
maxItems: 1
4444

45+
'#sound-dai-cells':
46+
const: 0
47+
4548
ports:
4649
$ref: /schemas/graph.yaml#/properties/ports
4750
properties:
@@ -85,7 +88,21 @@ required:
8588
- ports
8689
- max-linkrate-mhz
8790

88-
additionalProperties: false
91+
allOf:
92+
- $ref: /schemas/sound/dai-common.yaml#
93+
- if:
94+
not:
95+
properties:
96+
compatible:
97+
contains:
98+
enum:
99+
- mediatek,mt8188-dp-tx
100+
- mediatek,mt8195-dp-tx
101+
then:
102+
properties:
103+
'#sound-dai-cells': false
104+
105+
unevaluatedProperties: false
89106

90107
examples:
91108
- |

Documentation/devicetree/bindings/iio/st,st-sensors.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ properties:
6565
- st,lsm9ds0-gyro
6666
- description: STMicroelectronics Magnetometers
6767
enum:
68+
- st,iis2mdc
6869
- st,lis2mdl
6970
- st,lis3mdl-magn
7071
- st,lsm303agr-magn

Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ properties:
8181
List of phandles, each pointing to the power supply for the
8282
corresponding pairset named in 'pairset-names'. This property
8383
aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4.
84-
PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133)
84+
PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145-3)
8585
|-----------|---------------|---------------|---------------|---------------|
8686
| Conductor | Alternative A | Alternative A | Alternative B | Alternative B |
8787
| | (MDI-X) | (MDI) | (X) | (S) |

0 commit comments

Comments
 (0)