Skip to content

Commit ca31fef

Browse files
committed
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
Required bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes. Signed-off-by: Maarten Lankhorst <[email protected]>
2 parents ba6cd76 + 15d27b1 commit ca31fef

File tree

11,820 files changed

+547599
-291259
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,820 files changed

+547599
-291259
lines changed

.clang-format

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ ForEachMacros:
109109
- 'css_for_each_child'
110110
- 'css_for_each_descendant_post'
111111
- 'css_for_each_descendant_pre'
112-
- 'cxl_for_each_cmd'
113112
- 'device_for_each_child_node'
113+
- 'displayid_iter_for_each'
114114
- 'dma_fence_chain_for_each'
115115
- 'do_for_each_ftrace_op'
116116
- 'drm_atomic_crtc_for_each_plane'
@@ -136,6 +136,7 @@ ForEachMacros:
136136
- 'drm_mm_for_each_node_in_range'
137137
- 'drm_mm_for_each_node_safe'
138138
- 'flow_action_for_each'
139+
- 'for_each_acpi_dev_match'
139140
- 'for_each_active_dev_scope'
140141
- 'for_each_active_drhd_unit'
141142
- 'for_each_active_iommu'
@@ -171,14 +172,14 @@ ForEachMacros:
171172
- 'for_each_dapm_widgets'
172173
- 'for_each_dev_addr'
173174
- 'for_each_dev_scope'
174-
- 'for_each_displayid_db'
175175
- 'for_each_dma_cap_mask'
176176
- 'for_each_dpcm_be'
177177
- 'for_each_dpcm_be_rollback'
178178
- 'for_each_dpcm_be_safe'
179179
- 'for_each_dpcm_fe'
180180
- 'for_each_drhd_unit'
181181
- 'for_each_dss_dev'
182+
- 'for_each_dtpm_table'
182183
- 'for_each_efi_memory_desc'
183184
- 'for_each_efi_memory_desc_in_map'
184185
- 'for_each_element'
@@ -215,6 +216,7 @@ ForEachMacros:
215216
- 'for_each_migratetype_order'
216217
- 'for_each_msi_entry'
217218
- 'for_each_msi_entry_safe'
219+
- 'for_each_msi_vector'
218220
- 'for_each_net'
219221
- 'for_each_net_continue_reverse'
220222
- 'for_each_netdev'
@@ -270,6 +272,12 @@ ForEachMacros:
270272
- 'for_each_prime_number_from'
271273
- 'for_each_process'
272274
- 'for_each_process_thread'
275+
- 'for_each_prop_codec_conf'
276+
- 'for_each_prop_dai_codec'
277+
- 'for_each_prop_dai_cpu'
278+
- 'for_each_prop_dlc_codecs'
279+
- 'for_each_prop_dlc_cpus'
280+
- 'for_each_prop_dlc_platforms'
273281
- 'for_each_property_of_node'
274282
- 'for_each_registered_fb'
275283
- 'for_each_requested_gpio'
@@ -430,6 +438,7 @@ ForEachMacros:
430438
- 'queue_for_each_hw_ctx'
431439
- 'radix_tree_for_each_slot'
432440
- 'radix_tree_for_each_tagged'
441+
- 'rb_for_each'
433442
- 'rbtree_postorder_for_each_entry_safe'
434443
- 'rdma_for_each_block'
435444
- 'rdma_for_each_port'

.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Felipe W Damasio <[email protected]>
102102
Felix Kuhling <[email protected]>
103103
Felix Moeller <[email protected]>
104104
Filipe Lautert <[email protected]>
105+
105106
Franck Bui-Huu <[email protected]>
106107
107108
@@ -212,6 +213,8 @@ Manivannan Sadhasivam <[email protected]> <[email protected]>
212213
Manivannan Sadhasivam <[email protected]> <[email protected]>
213214
214215
216+
217+
Marek Behún <[email protected]> Marek Behun <[email protected]>
215218
Mark Brown <[email protected]>
216219
217220
@@ -243,6 +246,9 @@ Maxime Ripard <[email protected]> <[email protected]>
243246
Mayuresh Janorkar <[email protected]>
244247
Michael Buesch <[email protected]>
245248
Michel Dänzer <[email protected]>
249+
Michel Lespinasse <[email protected]>
250+
251+
246252
247253
248254
Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/buffer/length
2+
KernelVersion: 2.6.35
3+
4+
Description:
5+
Number of scans contained by the buffer.
6+
7+
Since Kernel 5.11, multiple buffers are supported.
8+
so, it is better to use, instead:
9+
/sys/bus/iio/devices/iio:deviceX/bufferY/length
10+
11+
What: /sys/bus/iio/devices/iio:deviceX/buffer/enable
12+
KernelVersion: 2.6.35
13+
14+
Description:
15+
Actually start the buffer capture up. Will start trigger
16+
if first device and appropriate.
17+
18+
Since Kernel 5.11, multiple buffers are supported.
19+
so, it is better to use, instead:
20+
/sys/bus/iio/devices/iio:deviceX/bufferY/enable
21+
22+
What: /sys/bus/iio/devices/iio:deviceX/scan_elements
23+
KernelVersion: 2.6.37
24+
25+
Description:
26+
Directory containing interfaces for elements that will be
27+
captured for a single triggered sample set in the buffer.
28+
29+
Since kernel 5.11 the scan_elements attributes are merged into
30+
the bufferY directory, to be configurable per buffer.
31+
32+
What: /sys/.../iio:deviceX/scan_elements/in_accel_x_en
33+
What: /sys/.../iio:deviceX/scan_elements/in_accel_y_en
34+
What: /sys/.../iio:deviceX/scan_elements/in_accel_z_en
35+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_x_en
36+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_y_en
37+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en
38+
What: /sys/.../iio:deviceX/scan_elements/in_magn_x_en
39+
What: /sys/.../iio:deviceX/scan_elements/in_magn_y_en
40+
What: /sys/.../iio:deviceX/scan_elements/in_magn_z_en
41+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_en
42+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_en
43+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_en
44+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_en
45+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_en
46+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
47+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_en
48+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en
49+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_en
50+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_en
51+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_en
52+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_en
53+
What: /sys/.../iio:deviceX/scan_elements/in_incli_x_en
54+
What: /sys/.../iio:deviceX/scan_elements/in_incli_y_en
55+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_en
56+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_en
57+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en
58+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_en
59+
KernelVersion: 2.6.37
60+
61+
Description:
62+
Scan element control for triggered data capture.
63+
64+
Since kernel 5.11 the scan_elements attributes are merged into
65+
the bufferY directory, to be configurable per buffer.
66+
67+
What: /sys/.../iio:deviceX/scan_elements/in_accel_type
68+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_type
69+
What: /sys/.../iio:deviceX/scan_elements/in_magn_type
70+
What: /sys/.../iio:deviceX/scan_elements/in_incli_type
71+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_type
72+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_type
73+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type
74+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_type
75+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_type
76+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_type
77+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_type
78+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_type
79+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_type
80+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_type
81+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type
82+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_type
83+
KernelVersion: 2.6.37
84+
85+
Description:
86+
Description of the scan element data storage within the buffer
87+
and hence the form in which it is read from user-space.
88+
Form is [be|le]:[s|u]bits/storagebits[>>shift].
89+
be or le specifies big or little endian. s or u specifies if
90+
signed (2's complement) or unsigned. bits is the number of bits
91+
of data and storagebits is the space (after padding) that it
92+
occupies in the buffer. shift if specified, is the shift that
93+
needs to be applied prior to masking out unused bits. Some
94+
devices put their data in the middle of the transferred elements
95+
with additional information on both sides. Note that some
96+
devices will have additional information in the unused bits
97+
so to get a clean value, the bits value must be used to mask
98+
the buffer output value appropriately. The storagebits value
99+
also specifies the data alignment. So s48/64>>2 will be a
100+
signed 48 bit integer stored in a 64 bit location aligned to
101+
a 64 bit boundary. To obtain the clean value, shift right 2
102+
and apply a mask to zero the top 16 bits of the result.
103+
For other storage combinations this attribute will be extended
104+
appropriately.
105+
106+
Since kernel 5.11 the scan_elements attributes are merged into
107+
the bufferY directory, to be configurable per buffer.
108+
109+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_index
110+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index
111+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_index
112+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_index
113+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_index
114+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_index
115+
What: /sys/.../iio:deviceX/scan_elements/in_accel_x_index
116+
What: /sys/.../iio:deviceX/scan_elements/in_accel_y_index
117+
What: /sys/.../iio:deviceX/scan_elements/in_accel_z_index
118+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_x_index
119+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_y_index
120+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index
121+
What: /sys/.../iio:deviceX/scan_elements/in_magn_x_index
122+
What: /sys/.../iio:deviceX/scan_elements/in_magn_y_index
123+
What: /sys/.../iio:deviceX/scan_elements/in_magn_z_index
124+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_index
125+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_index
126+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_index
127+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_index
128+
What: /sys/.../iio:deviceX/scan_elements/in_incli_x_index
129+
What: /sys/.../iio:deviceX/scan_elements/in_incli_y_index
130+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_index
131+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_index
132+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_index
133+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index
134+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_index
135+
KernelVersion: 2.6.37
136+
Description:
137+
A single positive integer specifying the position of this
138+
scan element in the buffer. Note these are not dependent on
139+
what is enabled and may not be contiguous. Thus for user-space
140+
to establish the full layout these must be used in conjunction
141+
with all _en attributes to establish which channels are present,
142+
and the relevant _type attributes to establish the data storage
143+
format.
144+
145+
Since kernel 5.11 the scan_elements attributes are merged into
146+
the bufferY directory, to be configurable per buffer.
147+
148+
What: /sys/bus/iio/devices/iio:deviceX/buffer/watermark
149+
KernelVersion: 4.2
150+
151+
Description:
152+
A single positive integer specifying the maximum number of scan
153+
elements to wait for.
154+
155+
Poll will block until the watermark is reached.
156+
157+
Blocking read will wait until the minimum between the requested
158+
read amount or the low water mark is available.
159+
160+
Non-blocking read will retrieve the available samples from the
161+
buffer even if there are less samples then watermark level. This
162+
allows the application to block on poll with a timeout and read
163+
the available samples after the timeout expires and thus have a
164+
maximum delay guarantee.
165+
166+
Since Kernel 5.11, multiple buffers are supported.
167+
so, it is better to use, instead:
168+
/sys/bus/iio/devices/iio:deviceX/bufferY/watermark
169+
170+
What: /sys/bus/iio/devices/iio:deviceX/buffer/data_available
171+
KernelVersion: 4.16
172+
173+
Description:
174+
A read-only value indicating the bytes of data available in the
175+
buffer. In the case of an output buffer, this indicates the
176+
amount of empty space available to write data to. In the case of
177+
an input buffer, this indicates the amount of data available for
178+
reading.
179+
180+
Since Kernel 5.11, multiple buffers are supported.
181+
so, it is better to use, instead:
182+
/sys/bus/iio/devices/iio:deviceX/bufferY/data_available

Documentation/ABI/obsolete/sysfs-cpuidle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Description:
66
with the update that cpuidle governor can be changed at runtime in default,
77
both current_governor and current_governor_ro co-exist under
88
/sys/devices/system/cpu/cpuidle/ file, it's duplicate so make
9-
current_governor_ro obselete.
9+
current_governor_ro obsolete.

Documentation/ABI/removed/sysfs-kernel-uids

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contact: Dhaval Giani <[email protected]>
55
Description:
66
The /sys/kernel/uids/<uid>/cpu_shares tunable is used
77
to set the cpu bandwidth a user is allowed. This is a
8-
propotional value. What that means is that if there
8+
proportional value. What that means is that if there
99
are two users logged in, each with an equal number of
1010
shares, then they will get equal CPU bandwidth. Another
1111
example would be, if User A has shares = 1024 and user

Documentation/ABI/stable/sysfs-bus-vmbus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Date: September. 2017
6161
KernelVersion: 4.14
6262
Contact: Stephen Hemminger <[email protected]>
6363
Description: Directory for per-channel information
64-
NN is the VMBUS relid associtated with the channel.
64+
NN is the VMBUS relid associated with the channel.
6565

6666
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
6767
Date: September. 2017

Documentation/ABI/stable/sysfs-bus-xen-backend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Date: April 2011
1919
KernelVersion: 3.0
2020
Contact: Konrad Rzeszutek Wilk <[email protected]>
2121
Description:
22-
The major:minor number (in hexidecimal) of the
22+
The major:minor number (in hexadecimal) of the
2323
physical device providing the storage for this backend
2424
block device.
2525

Documentation/ABI/stable/sysfs-class-infiniband

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -731,26 +731,6 @@ Description:
731731
is the irq number of "sdma3", and M is irq number of "sdma4" in
732732
the /proc/interrupts file.
733733

734-
735-
sysfs interface for Intel(R) X722 iWARP i40iw driver
736-
----------------------------------------------------
737-
738-
What: /sys/class/infiniband/i40iwX/hw_rev
739-
What: /sys/class/infiniband/i40iwX/hca_type
740-
What: /sys/class/infiniband/i40iwX/board_id
741-
Date: Jan, 2016
742-
KernelVersion: v4.10
743-
744-
Description:
745-
=============== ==== ========================
746-
hw_rev: (RO) Hardware revision number
747-
748-
hca_type: (RO) Show HCA type (I40IW)
749-
750-
board_id: (RO) I40IW board ID
751-
=============== ==== ========================
752-
753-
754734
sysfs interface for QLogic qedr NIC Driver
755735
------------------------------------------
756736

0 commit comments

Comments
 (0)