Skip to content

Commit a60501d

Browse files
committed
Merge tag 'drm-misc-next-2023-12-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 6.8: UAPI Changes: - Remove Userspace Mode-Setting ioctls - v3d: New uapi to handle jobs involving the CPU Cross-subsystem Changes: Core Changes: - atomic: Add support for FB-less planes which got reverted a bit later for lack of IGT tests and userspace code, Dump private objects state in drm_state_dump. - dma-buf: Add fence deadline support - encoder: Create per-encoder debugfs directory, move the bridge chain file to that directory Driver Changes: - Include drm_auth.h in driver that use it but don't include it, Drop drm_plane_helper.h from drivers that include it but don't use it - imagination: Plenty of small fixes - panfrost: Improve interrupt handling at poweroff - qaic: Convert to persistent DRM devices - tidss: Support for the AM62A7, a few probe improvements, some cleanups - v3d: Support for jobs involving the CPU - bridge: - Create transparent aux-bridge for DP/USB-C - lt8912b: Add suspend/resume support and power regulator support - panel: - himax-hx8394: Drop prepare, unprepare and shutdown logic, Support panel rotation - New panels: BOE BP101WX1-100, Powkiddy X55, Ampire AM8001280G, Evervision VGG644804, SDC ATNA45AF01 Signed-off-by: Dave Airlie <[email protected]> From: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/yu5heqaufyeo4nlowzieu4s5unwqrqyx4jixbfjmzdon677rpk@t53vceua2dao
2 parents 2f8d854 + 90d50b8 commit a60501d

File tree

258 files changed

+6456
-10514
lines changed

Some content is hidden

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

258 files changed

+6456
-10514
lines changed

Documentation/accel/qaic/qaic.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,15 @@ commands (does not impact QAIC).
9393
uAPI
9494
====
9595

96+
QAIC creates an accel device per phsyical PCIe device. This accel device exists
97+
for as long as the PCIe device is known to Linux.
98+
99+
The PCIe device may not be in the state to accept requests from userspace at
100+
all times. QAIC will trigger KOBJ_ONLINE/OFFLINE uevents to advertise when the
101+
device can accept requests (ONLINE) and when the device is no longer accepting
102+
requests (OFFLINE) because of a reset or other state transition.
103+
96104
QAIC defines a number of driver specific IOCTLs as part of the userspace API.
97-
This section describes those APIs.
98105

99106
DRM_IOCTL_QAIC_MANAGE
100107
This IOCTL allows userspace to send a NNC request to the QSM. The call will

Documentation/core-api/pin_user_pages.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ NOTE: Some pages, such as DAX pages, cannot be pinned with longterm pins. That's
153153
because DAX pages do not have a separate page cache, and so "pinning" implies
154154
locking down file system blocks, which is not (yet) supported in that way.
155155

156+
.. _mmu-notifier-registration-case:
157+
156158
CASE 3: MMU notifier registration, with or without page faulting hardware
157159
-------------------------------------------------------------------------
158160
Device drivers can pin pages via get_user_pages*(), and register for mmu

Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,27 @@ properties:
5555
- port@0
5656
- port@1
5757

58+
vcchdmipll-supply:
59+
description: A 1.8V supply that powers the HDMI PLL.
60+
61+
vcchdmitx-supply:
62+
description: A 1.8V supply that powers the HDMI TX part.
63+
64+
vcclvdspll-supply:
65+
description: A 1.8V supply that powers the LVDS PLL.
66+
67+
vcclvdstx-supply:
68+
description: A 1.8V supply that powers the LVDS TX part.
69+
70+
vccmipirx-supply:
71+
description: A 1.8V supply that powers the MIPI RX part.
72+
73+
vccsysclk-supply:
74+
description: A 1.8V supply that powers the SYSCLK.
75+
76+
vdd-supply:
77+
description: A 1.8V supply that powers the digital part.
78+
5879
required:
5980
- compatible
6081
- reg

Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
items:
2424
- enum:
2525
- hannstar,hsd060bhw4
26+
- powkiddy,x55-panel
2627
- const: himax,hx8394
2728

2829
reg: true
@@ -31,6 +32,8 @@ properties:
3132

3233
backlight: true
3334

35+
rotation: true
36+
3437
port: true
3538

3639
vcc-supply:

Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
compatible:
1717
items:
1818
- enum:
19+
- ampire,am8001280g
1920
- bananapi,lhr050h41
2021
- feixin,k101-im2byl02
2122
- tdo,tl050hdv35

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ properties:
7373
- auo,t215hvn01
7474
# Shanghai AVIC Optoelectronics 7" 1024x600 color TFT-LCD panel
7575
- avic,tm070ddh03
76+
# BOE BP101WX1-100 10.1" WXGA (1280x800) LVDS panel
77+
- boe,bp101wx1-100
7678
# BOE EV121WXM-N10-1850 12.1" WXGA (1280x800) TFT LCD panel
7779
- boe,ev121wxm-n10-1850
7880
# BOE HV070WSA-100 7.01" WSVGA TFT LCD panel
@@ -144,6 +146,8 @@ properties:
144146
- edt,etmv570g2dhu
145147
# E Ink VB3300-KCA
146148
- eink,vb3300-kca
149+
# Evervision Electronics Co. Ltd. VGG644804 5.7" VGA TFT LCD Panel
150+
- evervision,vgg644804
147151
# Evervision Electronics Co. Ltd. VGG804821 5.0" WVGA TFT LCD Panel
148152
- evervision,vgg804821
149153
# Foxlink Group 5" WVGA TFT LCD panel

Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
compatible:
2424
enum:
2525
- ti,am625-dss
26+
- ti,am62a7,dss
2627
- ti,am65x-dss
2728

2829
reg:
@@ -87,6 +88,7 @@ properties:
8788
For AM65x DSS, the OLDI output port node from video port 1.
8889
For AM625 DSS, the internal DPI output port node from video
8990
port 1.
91+
For AM62A7 DSS, the port is tied off inside the SoC.
9092

9193
port@1:
9294
$ref: /schemas/graph.yaml#/properties/port
@@ -108,6 +110,18 @@ properties:
108110
Input memory (from main memory to dispc) bandwidth limit in
109111
bytes per second
110112

113+
allOf:
114+
- if:
115+
properties:
116+
compatible:
117+
contains:
118+
const: ti,am62a7-dss
119+
then:
120+
properties:
121+
ports:
122+
properties:
123+
port@0: false
124+
111125
required:
112126
- compatible
113127
- reg

Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- allwinner,sun50i-a64-mali
3030
- rockchip,rk3036-mali
3131
- rockchip,rk3066-mali
32+
- rockchip,rk3128-mali
3233
- rockchip,rk3188-mali
3334
- rockchip,rk3228-mali
3435
- samsung,exynos4210-mali

Documentation/gpu/drm-kms.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,8 @@ Plane Composition Properties
548548
.. kernel-doc:: drivers/gpu/drm/drm_blend.c
549549
:doc: overview
550550

551+
.. _damage_tracking_properties:
552+
551553
Damage Tracking Properties
552554
--------------------------
553555

@@ -579,6 +581,12 @@ Variable Refresh Properties
579581
.. kernel-doc:: drivers/gpu/drm/drm_connector.c
580582
:doc: Variable refresh properties
581583

584+
Cursor Hotspot Properties
585+
---------------------------
586+
587+
.. kernel-doc:: drivers/gpu/drm/drm_plane.c
588+
:doc: hotspot properties
589+
582590
Existing KMS Properties
583591
-----------------------
584592

Documentation/gpu/drm-mm.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,8 @@ DRM MM Range Allocator Function References
466466
.. kernel-doc:: drivers/gpu/drm/drm_mm.c
467467
:export:
468468

469+
.. _drm_gpuvm:
470+
469471
DRM GPUVM
470472
=========
471473

@@ -481,6 +483,8 @@ Split and Merge
481483
.. kernel-doc:: drivers/gpu/drm/drm_gpuvm.c
482484
:doc: Split and Merge
483485

486+
.. _drm_gpuvm_locking:
487+
484488
Locking
485489
-------
486490

0 commit comments

Comments
 (0)