Skip to content

Commit e301aea

Browse files
author
Thomas Zimmermann
committed
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get the latest fixes from v6.12-rc6. Signed-off-by: Thomas Zimmermann <[email protected]>
2 parents b04ce1e + 59b723c commit e301aea

File tree

642 files changed

+7109
-4879
lines changed

Some content is hidden

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

642 files changed

+7109
-4879
lines changed

.mailmap

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ Elliot Berman <[email protected]> <[email protected]>
199199
Enric Balletbo i Serra <[email protected]> <[email protected]>
200200
Enric Balletbo i Serra <[email protected]> <[email protected]>
201201
202-
202+
203+
203204
Evgeniy Polyakov <[email protected]>
204205
205206
@@ -282,7 +283,7 @@ Jan Glauber <[email protected]> <[email protected]>
282283
283284
284285
285-
Jarkko Sakkinen <[email protected]> <jarkko.sakkinen@tuni.fi>
286+
Jarkko Sakkinen <[email protected]> <jarkko.sakkinen@parity.io>
286287
287288
288289
@@ -306,6 +307,11 @@ Jens Axboe <[email protected]> <[email protected]>
306307
307308
Jens Osterkamp <[email protected]>
308309
310+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
311+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
312+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
313+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
314+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
309315
310316
311317

Documentation/admin-guide/pm/cpufreq.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ This governor exposes only one tunable:
425425

426426
``rate_limit_us``
427427
Minimum time (in microseconds) that has to pass between two consecutive
428-
runs of governor computations (default: 1000 times the scaling driver's
429-
transition latency).
428+
runs of governor computations (default: 1.5 times the scaling driver's
429+
transition latency or the maximum 2ms).
430430

431431
The purpose of this tunable is to reduce the scheduler context overhead
432432
of the governor which might be excessive without it.
@@ -474,17 +474,17 @@ This governor exposes the following tunables:
474474
This is how often the governor's worker routine should run, in
475475
microseconds.
476476

477-
Typically, it is set to values of the order of 10000 (10 ms). Its
478-
default value is equal to the value of ``cpuinfo_transition_latency``
479-
for each policy this governor is attached to (but since the unit here
480-
is greater by 1000, this means that the time represented by
481-
``sampling_rate`` is 1000 times greater than the transition latency by
482-
default).
477+
Typically, it is set to values of the order of 2000 (2 ms). Its
478+
default value is to add a 50% breathing room
479+
to ``cpuinfo_transition_latency`` on each policy this governor is
480+
attached to. The minimum is typically the length of two scheduler
481+
ticks.
483482

484483
If this tunable is per-policy, the following shell command sets the time
485-
represented by it to be 750 times as high as the transition latency::
484+
represented by it to be 1.5 times as high as the transition latency
485+
(the default)::
486486

487-
# echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) > ondemand/sampling_rate
487+
# echo `$(($(cat cpuinfo_transition_latency) * 3 / 2)) > ondemand/sampling_rate
488488

489489
``up_threshold``
490490
If the estimated CPU load is above this value (in percent), the governor

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ properties:
6363
- const: sleep
6464

6565
power-domains:
66+
description: |
67+
The MediaTek DPI module is typically associated with one of the
68+
following multimedia power domains:
69+
POWER_DOMAIN_DISPLAY
70+
POWER_DOMAIN_VDOSYS
71+
POWER_DOMAIN_MM
72+
The specific power domain used varies depending on the SoC design.
73+
74+
It is recommended to explicitly add the appropriate power domain
75+
property to the DPI node in the device tree.
6676
maxItems: 1
6777

6878
port:
@@ -79,20 +89,6 @@ required:
7989
- clock-names
8090
- port
8191

82-
allOf:
83-
- if:
84-
not:
85-
properties:
86-
compatible:
87-
contains:
88-
enum:
89-
- mediatek,mt6795-dpi
90-
- mediatek,mt8173-dpi
91-
- mediatek,mt8186-dpi
92-
then:
93-
properties:
94-
power-domains: false
95-
9692
additionalProperties: false
9793

9894
examples:

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ properties:
3838
description: A phandle and PM domain specifier as defined by bindings of
3939
the power controller specified by phandle. See
4040
Documentation/devicetree/bindings/power/power-domain.yaml for details.
41+
maxItems: 1
4142

4243
mediatek,gce-client-reg:
4344
description:
@@ -57,6 +58,9 @@ properties:
5758
clocks:
5859
items:
5960
- description: SPLIT Clock
61+
- description: Used for interfacing with the HDMI RX signal source.
62+
- description: Paired with receiving HDMI RX metadata.
63+
minItems: 1
6064

6165
required:
6266
- compatible
@@ -72,9 +76,24 @@ allOf:
7276
const: mediatek,mt8195-mdp3-split
7377

7478
then:
79+
properties:
80+
clocks:
81+
minItems: 3
82+
7583
required:
7684
- mediatek,gce-client-reg
7785

86+
- if:
87+
properties:
88+
compatible:
89+
contains:
90+
const: mediatek,mt8173-disp-split
91+
92+
then:
93+
properties:
94+
clocks:
95+
maxItems: 1
96+
7897
additionalProperties: false
7998

8099
examples:

Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ properties:
6767
A 2.5V to 3.3V supply for the external reference voltage. When omitted,
6868
the internal 2.5V reference is used.
6969

70+
refin-supply:
71+
description:
72+
A 2.5V to 3.3V supply for external reference voltage, for ad7380-4 only.
73+
7074
aina-supply:
7175
description:
7276
The common mode voltage supply for the AINA- pin on pseudo-differential
@@ -135,6 +139,23 @@ allOf:
135139
ainc-supply: false
136140
aind-supply: false
137141

142+
# ad7380-4 uses refin-supply as external reference.
143+
# All other chips from ad738x family use refio as optional external reference.
144+
# When refio-supply is omitted, internal reference is used.
145+
- if:
146+
properties:
147+
compatible:
148+
enum:
149+
- adi,ad7380-4
150+
then:
151+
properties:
152+
refio-supply: false
153+
required:
154+
- refin-supply
155+
else:
156+
properties:
157+
refin-supply: false
158+
138159
examples:
139160
- |
140161
#include <dt-bindings/interrupt-controller/irq.h>

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ allOf:
154154
- qcom,sm8550-qmp-gen4x2-pcie-phy
155155
- qcom,sm8650-qmp-gen3x2-pcie-phy
156156
- qcom,sm8650-qmp-gen4x2-pcie-phy
157-
- qcom,x1e80100-qmp-gen3x2-pcie-phy
158-
- qcom,x1e80100-qmp-gen4x2-pcie-phy
159157
then:
160158
properties:
161159
clocks:
@@ -171,6 +169,8 @@ allOf:
171169
- qcom,sc8280xp-qmp-gen3x1-pcie-phy
172170
- qcom,sc8280xp-qmp-gen3x2-pcie-phy
173171
- qcom,sc8280xp-qmp-gen3x4-pcie-phy
172+
- qcom,x1e80100-qmp-gen3x2-pcie-phy
173+
- qcom,x1e80100-qmp-gen4x2-pcie-phy
174174
- qcom,x1e80100-qmp-gen4x4-pcie-phy
175175
then:
176176
properties:
@@ -201,6 +201,7 @@ allOf:
201201
- qcom,sm8550-qmp-gen4x2-pcie-phy
202202
- qcom,sm8650-qmp-gen4x2-pcie-phy
203203
- qcom,x1e80100-qmp-gen4x2-pcie-phy
204+
- qcom,x1e80100-qmp-gen4x4-pcie-phy
204205
then:
205206
properties:
206207
resets:

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,21 @@ properties:
102102
default: 2
103103

104104
interrupts:
105-
oneOf:
106-
- minItems: 1
107-
items:
108-
- description: TX interrupt
109-
- description: RX interrupt
110-
- items:
111-
- description: common/combined interrupt
105+
minItems: 1
106+
maxItems: 2
112107

113108
interrupt-names:
114109
oneOf:
115-
- minItems: 1
110+
- description: TX interrupt
111+
const: tx
112+
- description: RX interrupt
113+
const: rx
114+
- description: TX and RX interrupts
116115
items:
117116
- const: tx
118117
- const: rx
119-
- const: common
118+
- description: Common/combined interrupt
119+
const: common
120120

121121
fck_parent:
122122
$ref: /schemas/types.yaml#/definitions/string

Documentation/devicetree/bindings/sound/rockchip,rk3308-codec.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ properties:
4848
- const: mclk_rx
4949
- const: hclk
5050

51+
port:
52+
$ref: audio-graph-port.yaml#
53+
unevaluatedProperties: false
54+
5155
resets:
5256
maxItems: 1
5357

Documentation/filesystems/caching/cachefiles.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ set up cache ready for use. The following script commands are available:
115115

116116
This mask can also be set through sysfs, eg::
117117

118-
echo 5 >/sys/modules/cachefiles/parameters/debug
118+
echo 5 > /sys/module/cachefiles/parameters/debug
119119

120120

121121
Starting the Cache

Documentation/filesystems/netfs_library.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,4 +592,3 @@ API Function Reference
592592

593593
.. kernel-doc:: include/linux/netfs.h
594594
.. kernel-doc:: fs/netfs/buffered_read.c
595-
.. kernel-doc:: fs/netfs/io.c

0 commit comments

Comments
 (0)