Skip to content

Commit 2518f22

Browse files
committed
Merge tag 'drm-next-2022-05-25' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "Intel have enabled DG2 on certain SKUs for laptops, AMD has started some new GPU support, msm has user allocated VA controls dma-buf: - add dma_resv_replace_fences - add dma_resv_get_singleton - make dma_excl_fence private core: - EDID parser refactorings - switch drivers to drm_mode_copy/duplicate - DRM managed mutex initialization display-helper: - put HDMI, SCDC, HDCP, DSC and DP into new module gem: - rework fence handling ttm: - rework bulk move handling - add common debugfs for resource managers - convert to kvcalloc format helpers: - support monochrome formats - RGB888, RGB565 to XRGB8888 conversions fbdev: - cfb/sys_imageblit fixes - pagelist corruption fix - create offb platform device - deferred io improvements sysfb: - Kconfig rework - support for VESA mode selection bridge: - conversions to devm_drm_of_get_bridge - conversions to panel_bridge - analogix_dp - autosuspend support - it66121 - audio support - tc358767 - DSI to DPI support - icn6211 - PLL/I2C fixes, DT property - adv7611 - enable DRM_BRIDGE_OP_HPD - anx7625 - fill ELD if no monitor - dw_hdmi - add audio support - lontium LT9211 support, i.MXMP LDB - it6505: Kconfig fix, DPCD set power fix - adv7511 - CEC support for ADV7535 panel: - ltk035c5444t, B133UAN01, NV3052C panel support - DataImage FG040346DSSWBG04 support - st7735r - DT bindings fix - ssd130x - fixes i915: - DG2 laptop PCI-IDs ("motherboard down") - Initial RPL-P PCI IDs - compute engine ABI - DG2 Tile4 support - DG2 CCS clear color compression support - DG2 render/media compression formats support - ATS-M platform info - RPL-S PCI IDs added - Bump ADL-P DMC version to v2.16 - Support static DRRS - Support multiple eDP/LVDS native mode refresh rates - DP HDR support for HSW+ - Lots of display refactoring + fixes - GuC hwconfig support and query - sysfs support for multi-tile - fdinfo per-client gpu utilisation - add geometry subslices query - fix prime mmap with LMEM - fix vm open count and remove vma refcounts - contiguous allocation fixes - steered register write support - small PCI BAR enablement - GuC error capture support - sunset igpu legacy mmap support for newer devices - GuC version 70.1.1 support amdgpu: - Initial SoC21 support - SMU 13.x enablement - SMU 13.0.4 support - ttm_eu cleanups - USB-C, GPUVM updates - TMZ fixes for RV - RAS support for VCN - PM sysfs code cleanup - DC FP rework - extend CG/PG flags to 64-bit - SI dpm lockdep fix - runtime PM fixes amdkfd: - RAS/SVM fixes - TLB flush fixes - CRIU GWS support - ignore bogus MEC signals more efficiently msm: - Fourcc modifier for tiled but not compressed layouts - Support for userspace allocated IOVA (GPU virtual address) - DPU: DSC (Display Stream Compression) support - DP: eDP support - DP: conversion to use drm_bridge and drm_bridge_connector - Merge DPU1 and MDP5 MDSS driver - DPU: writeback support nouveau: - make some structures static - make some variables static - switch to drm_gem_plane_helper_prepare_fb radeon: - misc fixes/cleanups mxsfb: - rework crtc mode setting - LCDIF CRC support etnaviv: - fencing improvements - fix address space collisions - cleanup MMU reference handling gma500: - GEM/GTT improvements - connector handling fixes komeda: - switch to plane reset helper mediatek: - MIPI DSI improvements omapdrm: - GEM improvements qxl: - aarch64 support vc4: - add a CL submission tracepoint - HDMI YUV support - HDMI/clock improvements - drop is_hdmi caching virtio: - remove restriction of non-zero blob types vmwgfx: - support for cursormob and cursorbypass 4 - fence improvements tidss: - reset DISPC on startup solomon: - SPI support - DT improvements sun4i: - allwinner D1 support - drop is_hdmi caching imx: - use swap() instead of open-coding - use devm_platform_ioremap_resource - remove redunant initializations ast: - Displayport support rockchip: - Refactor IOMMU initialisation - make some structures static - replace drm_detect_hdmi_monitor with drm_display_info.is_hdmi - support swapped YUV formats, - clock improvements - rk3568 support - VOP2 support mediatek: - MT8186 support tegra: - debugabillity improvements" * tag 'drm-next-2022-05-25' of git://anongit.freedesktop.org/drm/drm: (1740 commits) drm/i915/dsi: fix VBT send packet port selection for ICL+ drm/i915/uc: Fix undefined behavior due to shift overflowing the constant drm/i915/reg: fix undefined behavior due to shift overflowing the constant drm/i915/gt: Fix use of static in macro mismatch drm/i915/audio: fix audio code enable/disable pipe logging drm/i915: Fix CFI violation with show_dynamic_id() drm/i915: Fix 'mixing different enum types' warnings in intel_display_power.c drm/i915/gt: Fix build error without CONFIG_PM drm/msm/dpu: handle pm_runtime_get_sync() errors in bind path drm/msm/dpu: add DRM_MODE_ROTATE_180 back to supported rotations drm/msm: don't free the IRQ if it was not requested drm/msm/dpu: limit writeback modes according to max_linewidth drm/amd: Don't reset dGPUs if the system is going to s2idle drm/amdgpu: Unmap legacy queue when MES is enabled drm: msm: fix possible memory leak in mdp5_crtc_cursor_set() drm/msm: Fix fb plane offset calculation drm/msm/a6xx: Fix refcount leak in a6xx_gpu_init drm/msm/dsi: don't powerup at modeset time for parade-ps8640 drm/rockchip: Change register space names in vop2 dt-bindings: display: rockchip: make reg-names mandatory for VOP2 ...
2 parents 86c87be + c4955d9 commit 2518f22

1,297 files changed

Lines changed: 495698 additions & 31991 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.

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ properties:
6262
- allwinner,sun8i-r40-display-engine
6363
- allwinner,sun8i-v3s-display-engine
6464
- allwinner,sun9i-a80-display-engine
65+
- allwinner,sun20i-d1-display-engine
6566
- allwinner,sun50i-a64-display-engine
6667
- allwinner,sun50i-h6-display-engine
6768

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ properties:
3333
- const: allwinner,sun8i-v3s-tcon
3434
- const: allwinner,sun9i-a80-tcon-lcd
3535
- const: allwinner,sun9i-a80-tcon-tv
36+
- const: allwinner,sun20i-d1-tcon-lcd
37+
- const: allwinner,sun20i-d1-tcon-tv
3638

3739
- items:
3840
- enum:

Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ properties:
1919
- allwinner,sun8i-r40-de2-mixer-0
2020
- allwinner,sun8i-r40-de2-mixer-1
2121
- allwinner,sun8i-v3s-de2-mixer
22+
- allwinner,sun20i-d1-de2-mixer-0
23+
- allwinner,sun20i-d1-de2-mixer-1
2224
- allwinner,sun50i-a64-de2-mixer-0
2325
- allwinner,sun50i-a64-de2-mixer-1
2426
- allwinner,sun50i-h6-de3-mixer-0

Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml

Lines changed: 89 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -41,38 +41,23 @@ properties:
4141
compatible:
4242
enum:
4343
- allwinner,sun8i-r40-tcon-top
44+
- allwinner,sun20i-d1-tcon-top
4445
- allwinner,sun50i-h6-tcon-top
4546

4647
reg:
4748
maxItems: 1
4849

4950
clocks:
5051
minItems: 2
51-
items:
52-
- description: The TCON TOP interface clock
53-
- description: The TCON TOP TV0 clock
54-
- description: The TCON TOP TVE0 clock
55-
- description: The TCON TOP TV1 clock
56-
- description: The TCON TOP TVE1 clock
57-
- description: The TCON TOP MIPI DSI clock
52+
maxItems: 6
5853

5954
clock-names:
6055
minItems: 2
61-
items:
62-
- const: bus
63-
- const: tcon-tv0
64-
- const: tve0
65-
- const: tcon-tv1
66-
- const: tve1
67-
- const: dsi
56+
maxItems: 6
6857

6958
clock-output-names:
7059
minItems: 1
7160
maxItems: 3
72-
description: >
73-
The first item is the name of the clock created for the TV0
74-
channel, the second item is the name of the TCON TV1 channel
75-
clock and the third one is the name of the DSI channel clock.
7661

7762
resets:
7863
maxItems: 1
@@ -129,32 +114,92 @@ required:
129114

130115
additionalProperties: false
131116

132-
if:
133-
properties:
134-
compatible:
135-
contains:
136-
const: allwinner,sun50i-h6-tcon-top
137-
138-
then:
139-
properties:
140-
clocks:
141-
maxItems: 2
142-
143-
clock-output-names:
144-
maxItems: 1
145-
146-
else:
147-
properties:
148-
clocks:
149-
minItems: 6
150-
151-
clock-output-names:
152-
minItems: 3
153-
154-
ports:
155-
required:
156-
- port@2
157-
- port@3
117+
allOf:
118+
- if:
119+
properties:
120+
compatible:
121+
contains:
122+
const: allwinner,sun8i-r40-tcon-top
123+
124+
then:
125+
properties:
126+
clocks:
127+
items:
128+
- description: The TCON TOP interface clock
129+
- description: The TCON TOP TV0 clock
130+
- description: The TCON TOP TVE0 clock
131+
- description: The TCON TOP TV1 clock
132+
- description: The TCON TOP TVE1 clock
133+
- description: The TCON TOP MIPI DSI clock
134+
135+
clock-names:
136+
items:
137+
- const: bus
138+
- const: tcon-tv0
139+
- const: tve0
140+
- const: tcon-tv1
141+
- const: tve1
142+
- const: dsi
143+
144+
clock-output-names:
145+
items:
146+
- description: TCON TV0 output clock name
147+
- description: TCON TV1 output clock name
148+
- description: DSI output clock name
149+
150+
ports:
151+
required:
152+
- port@2
153+
- port@3
154+
155+
- if:
156+
properties:
157+
compatible:
158+
contains:
159+
const: allwinner,sun20i-d1-tcon-top
160+
161+
then:
162+
properties:
163+
clocks:
164+
items:
165+
- description: The TCON TOP interface clock
166+
- description: The TCON TOP TV0 clock
167+
- description: The TCON TOP TVE0 clock
168+
- description: The TCON TOP MIPI DSI clock
169+
170+
clock-names:
171+
items:
172+
- const: bus
173+
- const: tcon-tv0
174+
- const: tve0
175+
- const: dsi
176+
177+
clock-output-names:
178+
items:
179+
- description: TCON TV0 output clock name
180+
- description: DSI output clock name
181+
182+
- if:
183+
properties:
184+
compatible:
185+
contains:
186+
const: allwinner,sun50i-h6-tcon-top
187+
188+
then:
189+
properties:
190+
clocks:
191+
items:
192+
- description: The TCON TOP interface clock
193+
- description: The TCON TOP TV0 clock
194+
195+
clock-names:
196+
items:
197+
- const: bus
198+
- const: tcon-tv0
199+
200+
clock-output-names:
201+
items:
202+
- description: TCON TV0 output clock name
158203

159204
examples:
160205
- |

Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,26 @@ properties:
4141

4242
properties:
4343
port@0:
44-
$ref: /schemas/graph.yaml#/properties/port
44+
$ref: /schemas/graph.yaml#/$defs/port-base
45+
unevaluatedProperties: false
4546
description:
4647
Video port for MIPI DSI input
4748

49+
properties:
50+
endpoint:
51+
$ref: /schemas/media/video-interfaces.yaml#
52+
unevaluatedProperties: false
53+
54+
properties:
55+
data-lanes:
56+
description: array of physical DSI data lane indexes.
57+
minItems: 1
58+
items:
59+
- const: 1
60+
- const: 2
61+
- const: 3
62+
- const: 4
63+
4864
port@1:
4965
$ref: /schemas/graph.yaml#/properties/port
5066
description:
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/bridge/fsl,ldb.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX8MP DPI to LVDS bridge chip
8+
9+
maintainers:
10+
- Marek Vasut <marex@denx.de>
11+
12+
description: |
13+
The i.MX8MP mediamix contains two registers which are responsible
14+
for configuring the on-SoC DPI-to-LVDS serializer. This describes
15+
those registers as bridge within the DT.
16+
17+
properties:
18+
compatible:
19+
const: fsl,imx8mp-ldb
20+
21+
clocks:
22+
maxItems: 1
23+
24+
clock-names:
25+
const: ldb
26+
27+
ports:
28+
$ref: /schemas/graph.yaml#/properties/ports
29+
30+
properties:
31+
port@0:
32+
$ref: /schemas/graph.yaml#/properties/port
33+
description: Video port for DPI input.
34+
35+
port@1:
36+
$ref: /schemas/graph.yaml#/properties/port
37+
description: Video port for LVDS Channel-A output (panel or bridge).
38+
39+
port@2:
40+
$ref: /schemas/graph.yaml#/properties/port
41+
description: Video port for LVDS Channel-B output (panel or bridge).
42+
43+
required:
44+
- port@0
45+
- port@1
46+
47+
required:
48+
- compatible
49+
- clocks
50+
- ports
51+
52+
additionalProperties: false
53+
54+
examples:
55+
- |
56+
#include <dt-bindings/clock/imx8mp-clock.h>
57+
58+
blk-ctrl {
59+
bridge {
60+
compatible = "fsl,imx8mp-ldb";
61+
clocks = <&clk IMX8MP_CLK_MEDIA_LDB>;
62+
clock-names = "ldb";
63+
64+
ports {
65+
#address-cells = <1>;
66+
#size-cells = <0>;
67+
68+
port@0 {
69+
reg = <0>;
70+
71+
ldb_from_lcdif2: endpoint {
72+
remote-endpoint = <&lcdif2_to_ldb>;
73+
};
74+
};
75+
76+
port@1 {
77+
reg = <1>;
78+
79+
ldb_lvds_ch0: endpoint {
80+
remote-endpoint = <&ldb_to_lvdsx4panel>;
81+
};
82+
};
83+
84+
port@2 {
85+
reg = <2>;
86+
87+
ldb_lvds_ch1: endpoint {
88+
};
89+
};
90+
};
91+
};
92+
};

Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ properties:
3838
interrupts:
3939
maxItems: 1
4040

41+
"#sound-dai-cells":
42+
const: 0
43+
4144
ports:
4245
$ref: /schemas/graph.yaml#/properties/ports
4346

0 commit comments

Comments
 (0)