Skip to content

Commit e21354a

Browse files
author
Maarten Lankhorst
committed
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
Pull in drm-intel-next for the updates to drm panic handling. Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
2 parents 482c7e2 + 203dcde commit e21354a

1,088 files changed

Lines changed: 31989 additions & 20635 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,9 @@ Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
426426
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
427427
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
428428
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
429+
Kuniyuki Iwashima <kuniyu@google.com> <kuniyu@amazon.com>
430+
Kuniyuki Iwashima <kuniyu@google.com> <kuniyu@amazon.co.jp>
431+
Kuniyuki Iwashima <kuniyu@google.com> <kuni1840@gmail.com>
429432
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
430433
Lee Jones <lee@kernel.org> <joneslee@google.com>
431434
Lee Jones <lee@kernel.org> <lee.jones@canonical.com>
@@ -719,6 +722,7 @@ Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>
719722
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
720723
Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
721724
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
725+
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
722726
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
723727
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
724728
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,51 @@ Contact: intel-xe@lists.freedesktop.org
148148
Description: RO. Fan 3 speed in RPM.
149149

150150
Only supported for particular Intel Xe graphics platforms.
151+
152+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_cap
153+
Date: May 2025
154+
KernelVersion: 6.15
155+
Contact: intel-xe@lists.freedesktop.org
156+
Description: RW. Card burst (PL2) power limit in microwatts.
157+
158+
The power controller will throttle the operating frequency
159+
if the power averaged over a window (typically milli seconds)
160+
exceeds this limit. A read value of 0 means that the PL2
161+
power limit is disabled, writing 0 disables the limit.
162+
PL2 is greater than PL1 and its time window is lesser
163+
compared to PL1.
164+
165+
Only supported for particular Intel Xe graphics platforms.
166+
167+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_cap
168+
Date: May 2025
169+
KernelVersion: 6.15
170+
Contact: intel-xe@lists.freedesktop.org
171+
Description: RW. Package burst (PL2) power limit in microwatts.
172+
173+
The power controller will throttle the operating frequency
174+
if the power averaged over a window (typically milli seconds)
175+
exceeds this limit. A read value of 0 means that the PL2
176+
power limit is disabled, writing 0 disables the limit.
177+
PL2 is greater than PL1 and its time window is lesser
178+
compared to PL1.
179+
180+
Only supported for particular Intel Xe graphics platforms.
181+
182+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_cap_interval
183+
Date: May 2025
184+
KernelVersion: 6.15
185+
Contact: intel-xe@lists.freedesktop.org
186+
Description: RW. Card burst power limit interval (Tau in PL2/Tau) in
187+
milliseconds over which sustained power is averaged.
188+
189+
Only supported for particular Intel Xe graphics platforms.
190+
191+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_cap_interval
192+
Date: May 2025
193+
KernelVersion: 6.15
194+
Contact: intel-xe@lists.freedesktop.org
195+
Description: RW. Package burst power limit interval (Tau in PL2/Tau) in
196+
milliseconds over which sustained power is averaged.
197+
198+
Only supported for particular Intel Xe graphics platforms.

Documentation/admin-guide/cifs/usage.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ configured for Unix Extensions (and the client has not disabled
270270
illegal Windows/NTFS/SMB characters to a remap range (this mount parameter
271271
is the default for SMB3). This remap (``mapposix``) range is also
272272
compatible with Mac (and "Services for Mac" on some older Windows).
273+
When POSIX Extensions for SMB 3.1.1 are negotiated, remapping is automatically
274+
disabled.
273275

274276
CIFS VFS Mount Options
275277
======================

Documentation/block/ublk.rst

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,83 @@ For reaching best IO performance, ublk server should align its segment
352352
parameter of `struct ublk_param_segment` with backend for avoiding
353353
unnecessary IO split, which usually hurts io_uring performance.
354354

355+
Auto Buffer Registration
356+
------------------------
357+
358+
The ``UBLK_F_AUTO_BUF_REG`` feature automatically handles buffer registration
359+
and unregistration for I/O requests, which simplifies the buffer management
360+
process and reduces overhead in the ublk server implementation.
361+
362+
This is another feature flag for using zero copy, and it is compatible with
363+
``UBLK_F_SUPPORT_ZERO_COPY``.
364+
365+
Feature Overview
366+
~~~~~~~~~~~~~~~~
367+
368+
This feature automatically registers request buffers to the io_uring context
369+
before delivering I/O commands to the ublk server and unregisters them when
370+
completing I/O commands. This eliminates the need for manual buffer
371+
registration/unregistration via ``UBLK_IO_REGISTER_IO_BUF`` and
372+
``UBLK_IO_UNREGISTER_IO_BUF`` commands, then IO handling in ublk server
373+
can avoid dependency on the two uring_cmd operations.
374+
375+
IOs can't be issued concurrently to io_uring if there is any dependency
376+
among these IOs. So this way not only simplifies ublk server implementation,
377+
but also makes concurrent IO handling becomes possible by removing the
378+
dependency on buffer registration & unregistration commands.
379+
380+
Usage Requirements
381+
~~~~~~~~~~~~~~~~~~
382+
383+
1. The ublk server must create a sparse buffer table on the same ``io_ring_ctx``
384+
used for ``UBLK_IO_FETCH_REQ`` and ``UBLK_IO_COMMIT_AND_FETCH_REQ``. If
385+
uring_cmd is issued on a different ``io_ring_ctx``, manual buffer
386+
unregistration is required.
387+
388+
2. Buffer registration data must be passed via uring_cmd's ``sqe->addr`` with the
389+
following structure::
390+
391+
struct ublk_auto_buf_reg {
392+
__u16 index; /* Buffer index for registration */
393+
__u8 flags; /* Registration flags */
394+
__u8 reserved0; /* Reserved for future use */
395+
__u32 reserved1; /* Reserved for future use */
396+
};
397+
398+
ublk_auto_buf_reg_to_sqe_addr() is for converting the above structure into
399+
``sqe->addr``.
400+
401+
3. All reserved fields in ``ublk_auto_buf_reg`` must be zeroed.
402+
403+
4. Optional flags can be passed via ``ublk_auto_buf_reg.flags``.
404+
405+
Fallback Behavior
406+
~~~~~~~~~~~~~~~~~
407+
408+
If auto buffer registration fails:
409+
410+
1. When ``UBLK_AUTO_BUF_REG_FALLBACK`` is enabled:
411+
412+
- The uring_cmd is completed
413+
- ``UBLK_IO_F_NEED_REG_BUF`` is set in ``ublksrv_io_desc.op_flags``
414+
- The ublk server must manually deal with the failure, such as, register
415+
the buffer manually, or using user copy feature for retrieving the data
416+
for handling ublk IO
417+
418+
2. If fallback is not enabled:
419+
420+
- The ublk I/O request fails silently
421+
- The uring_cmd won't be completed
422+
423+
Limitations
424+
~~~~~~~~~~~
425+
426+
- Requires same ``io_ring_ctx`` for all operations
427+
- May require manual buffer management in fallback cases
428+
- io_ring_ctx buffer table has a max size of 16K, which may not be enough
429+
in case that too many ublk devices are handled by this single io_ring_ctx
430+
and each one has very large queue depth
431+
355432
References
356433
==========
357434

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ properties:
3838
- qcom,sm8450-dp
3939
- qcom,sm8550-dp
4040
- const: qcom,sm8350-dp
41+
- items:
42+
- enum:
43+
- qcom,sm8750-dp
44+
- const: qcom,sm8650-dp
4145

4246
reg:
4347
minItems: 4

Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ properties:
4242
- qcom,sm8450-dsi-ctrl
4343
- qcom,sm8550-dsi-ctrl
4444
- qcom,sm8650-dsi-ctrl
45+
- qcom,sm8750-dsi-ctrl
4546
- const: qcom,mdss-dsi-ctrl
4647
- enum:
4748
- qcom,dsi-ctrl-6g-qcm2290
@@ -70,11 +71,11 @@ properties:
7071
- mnoc:: MNOC clock
7172
- pixel:: Display pixel clock.
7273
minItems: 3
73-
maxItems: 9
74+
maxItems: 12
7475

7576
clock-names:
7677
minItems: 3
77-
maxItems: 9
78+
maxItems: 12
7879

7980
phys:
8081
maxItems: 1
@@ -109,7 +110,8 @@ properties:
109110
minItems: 2
110111
maxItems: 4
111112
description: |
112-
Parents of "byte" and "pixel" for the given platform.
113+
For DSI on SM8650 and older: parents of "byte" and "pixel" for the given
114+
platform.
113115
For DSIv2 platforms this should contain "byte", "esc", "src" and
114116
"pixel_src" clocks.
115117
@@ -218,8 +220,6 @@ required:
218220
- clocks
219221
- clock-names
220222
- phys
221-
- assigned-clocks
222-
- assigned-clock-parents
223223
- ports
224224

225225
allOf:
@@ -244,6 +244,9 @@ allOf:
244244
- const: byte
245245
- const: pixel
246246
- const: core
247+
required:
248+
- assigned-clocks
249+
- assigned-clock-parents
247250

248251
- if:
249252
properties:
@@ -266,6 +269,9 @@ allOf:
266269
- const: byte
267270
- const: pixel
268271
- const: core
272+
required:
273+
- assigned-clocks
274+
- assigned-clock-parents
269275

270276
- if:
271277
properties:
@@ -288,6 +294,9 @@ allOf:
288294
- const: pixel
289295
- const: core
290296
- const: core_mmss
297+
required:
298+
- assigned-clocks
299+
- assigned-clock-parents
291300

292301
- if:
293302
properties:
@@ -309,6 +318,9 @@ allOf:
309318
- const: core_mmss
310319
- const: pixel
311320
- const: core
321+
required:
322+
- assigned-clocks
323+
- assigned-clock-parents
312324

313325
- if:
314326
properties:
@@ -346,6 +358,35 @@ allOf:
346358
- const: core
347359
- const: iface
348360
- const: bus
361+
required:
362+
- assigned-clocks
363+
- assigned-clock-parents
364+
365+
- if:
366+
properties:
367+
compatible:
368+
contains:
369+
enum:
370+
- qcom,sm8750-dsi-ctrl
371+
then:
372+
properties:
373+
clocks:
374+
minItems: 12
375+
maxItems: 12
376+
clock-names:
377+
items:
378+
- const: byte
379+
- const: byte_intf
380+
- const: pixel
381+
- const: core
382+
- const: iface
383+
- const: bus
384+
- const: dsi_pll_pixel
385+
- const: dsi_pll_byte
386+
- const: esync
387+
- const: osc
388+
- const: byte_src
389+
- const: pixel_src
349390

350391
- if:
351392
properties:
@@ -369,6 +410,9 @@ allOf:
369410
- const: core_mmss
370411
- const: pixel
371412
- const: core
413+
required:
414+
- assigned-clocks
415+
- assigned-clock-parents
372416

373417
unevaluatedProperties: false
374418

Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- qcom,sm8450-dsi-phy-5nm
2626
- qcom,sm8550-dsi-phy-4nm
2727
- qcom,sm8650-dsi-phy-4nm
28+
- qcom,sm8750-dsi-phy-3nm
2829

2930
reg:
3031
items:

Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
enum:
1717
- qcom,sa8775p-dpu
1818
- qcom,sm8650-dpu
19+
- qcom,sm8750-dpu
1920
- qcom,x1e80100-dpu
2021

2122
reg:

0 commit comments

Comments
 (0)