Skip to content

Commit 1b72240

Browse files
committed
Merge tag 'drm-next-2023-06-29' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "There is one set of patches to misc for a i915 gsc/mei proxy driver. Otherwise it's mostly amdgpu/i915/msm, lots of hw enablement and lots of refactoring. core: - replace strlcpy with strscpy - EDID changes to support further conversion to struct drm_edid - Move i915 DSC parameter code to common DRM helpers - Add Colorspace functionality aperture: - ignore framebuffers with non-primary devices fbdev: - use fbdev i/o helpers - add Kconfig options for fb_ops helpers - use new fb io helpers directly in drivers sysfs: - export DRM connector ID scheduler: - Avoid an infinite loop ttm: - store function table in .rodata - Add query for TTM mem limit - Add NUMA awareness to pools - Export ttm_pool_fini() bridge: - fsl-ldb: support i.MX6SX - lt9211, lt9611: remove blanking packets - tc358768: implement input bus formats, devm cleanups - ti-snd65dsi86: implement wait_hpd_asserted - analogix: fix endless probe loop - samsung-dsim: support swapped clock, fix enabling, support var clock - display-connector: Add support for external power supply - imx: Fix module linking - tc358762: Support reset GPIO panel: - nt36523: Support Lenovo J606F - st7703: Support Anbernic RG353V-V2 - InnoLux G070ACE-L01 support - boe-tv101wum-nl6: Improve initialization - sharp-ls043t1le001: Mode fixes - simple: BOE EV121WXM-N10-1850, S6D7AA0 - Ampire AM-800480L1TMQW-T00H - Rocktech RK043FN48H - Starry himax83102-j02 - Starry ili9882t amdgpu: - add new ctx query flag to handle reset better - add new query/set shadow buffer for rdna3 - DCN 3.2/3.1.x/3.0.x updates - Enable DC_FP on loongarch - PCIe fix for RDNA2 - improve DC FAMS/SubVP support for better power management - partition support for lots of engines - Take NUMA into account when allocating memory - Add new DRM_AMDGPU_WERROR config parameter to help with CI - Initial SMU13 overdrive support - Add support for new colorspace KMS API - W=1 fixes amdkfd: - Query TTM mem limit rather than hardcoding it - GC 9.4.3 partition support - Handle NUMA for partitions - Add debugger interface for enabling gdb - Add KFD event age tracking radeon: - Fix possible UAF i915: - new getparam for PXP support - GSC/MEI proxy driver - Meteorlake display enablement - avoid clearing preallocated framebuffers with TTM - implement framebuffer mmap support - Disable sampler indirect state in bindless heap - Enable fdinfo for GuC backends - GuC loading and firmware table handling fixes - Various refactors for multi-tile enablement - Define MOCS and PAT tables for MTL - GSC/MEI support for Meteorlake - PMU multi-tile support - Large driver kernel doc cleanup - Allow VRR toggling and arbitrary refresh rates - Support async flips on linear buffers on display ver 12+ - Expose CRTC CTM property on ILK/SNB/VLV - New debugfs for display clock frequencies - Hotplug refactoring - Display refactoring - I915_GEM_CREATE_EXT_SET_PAT for Mesa on Meteorlake - Use large rings for compute contexts - HuC loading for MTL - Allow user to set cache at BO creation - MTL powermanagement enhancements - Switch to dedicated workqueues to stop using flush_scheduled_work() - Move display runtime init under display/ - Remove 10bit gamma on desktop gen3 parts, they don't support it habanalabs: - uapi: return 0 for user queries if there was a h/w or f/w error - Add pci health check when we lose connection with the firmware. This can be used to distinguish between pci link down and firmware getting stuck. - Add more info to the error print when TPC interrupt occur. - Firmware fixes msm: - Adreno A660 bindings - SM8350 MDSS bindings fix - Added support for DPU on sm6350 and sm6375 platforms - Implemented tearcheck support to support vsync on SM150 and newer platforms - Enabled missing features (DSPP, DSC, split display) on sc8180x, sc8280xp, sm8450 - Added support for DSI and 28nm DSI PHY on MSM8226 platform - Added support for DSI on sm6350 and sm6375 platforms - Added support for display controller on MSM8226 platform - A690 GPU support - Move cmdstream dumping out of fence signaling path - a610 support - Support for a6xx devices without GMU nouveau: - NULL ptr before deref fixes armada: - implement fbdev emulation as client sun4i: - fix mipi-dsi dotclock - release clocks vc4: - rgb range toggle property - BT601 / BT2020 HDMI support vkms: - convert to drmm helpers - add reflection and rotation support - fix rgb565 conversion gma500: - fix iomem access shmobile: - support renesas soc platform - enable fbdev mxsfb: - Add support for i.MX93 LCDIF stm: - dsi: Use devm_ helper - ltdc: Fix potential invalid pointer deref renesas: - Group drivers in renesas subdirectory to prepare for new platform - Drop deprecated R-Car H3 ES1.x support meson: - Add support for MIPI DSI displays virtio: - add sync object support mediatek: - Add display binding document for MT6795" * tag 'drm-next-2023-06-29' of git://anongit.freedesktop.org/drm/drm: (1791 commits) drm/i915: Fix a NULL vs IS_ERR() bug drm/i915: make i915_drm_client_fdinfo() reference conditional again drm/i915/huc: Fix missing error code in intel_huc_init() drm/i915/gsc: take a wakeref for the proxy-init-completion check drm/msm/a6xx: Add A610 speedbin support drm/msm/a6xx: Add A619_holi speedbin support drm/msm/a6xx: Use adreno_is_aXYZ macros in speedbin matching drm/msm/a6xx: Use "else if" in GPU speedbin rev matching drm/msm/a6xx: Fix some A619 tunables drm/msm/a6xx: Add A610 support drm/msm/a6xx: Add support for A619_holi drm/msm/adreno: Disable has_cached_coherent in GMU wrapper configurations drm/msm/a6xx: Introduce GMU wrapper support drm/msm/a6xx: Move CX GMU power counter enablement to hw_init drm/msm/a6xx: Extend and explain UBWC config drm/msm/a6xx: Remove both GBIF and RBBM GBIF halt on hw init drm/msm/a6xx: Add a helper for software-resetting the GPU drm/msm/a6xx: Improve a6xx_bus_clear_pending_transactions() drm/msm/a6xx: Move a6xx_bus_clear_pending_transactions to a6xx_gpu drm/msm/a6xx: Move force keepalive vote removal to a6xx_gmu_force_off() ...
2 parents f8824e1 + 5ff2977 commit 1b72240

1,245 files changed

Lines changed: 80695 additions & 23104 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
332332
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
333333
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
334334
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
335+
Maxime Ripard <mripard@kernel.org> <maxime@cerno.tech>
335336
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
336337
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
337338
Mayuresh Janorkar <mayur@ti.com>
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2020 BayLibre, SAS
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/display/amlogic,meson-g12a-dw-mipi-dsi.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Amlogic specific extensions to the Synopsys Designware MIPI DSI Host Controller
9+
10+
maintainers:
11+
- Neil Armstrong <neil.armstrong@linaro.org>
12+
13+
description: |
14+
The Amlogic Meson Synopsys Designware Integration is composed of
15+
- A Synopsys DesignWare MIPI DSI Host Controller IP
16+
- A TOP control block controlling the Clocks & Resets of the IP
17+
18+
allOf:
19+
- $ref: dsi-controller.yaml#
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- amlogic,meson-g12a-dw-mipi-dsi
25+
26+
reg:
27+
maxItems: 1
28+
29+
clocks:
30+
minItems: 3
31+
maxItems: 4
32+
33+
clock-names:
34+
minItems: 3
35+
items:
36+
- const: pclk
37+
- const: bit
38+
- const: px
39+
- const: meas
40+
41+
resets:
42+
maxItems: 1
43+
44+
reset-names:
45+
items:
46+
- const: top
47+
48+
phys:
49+
maxItems: 1
50+
51+
phy-names:
52+
items:
53+
- const: dphy
54+
55+
ports:
56+
$ref: /schemas/graph.yaml#/properties/ports
57+
58+
properties:
59+
port@0:
60+
$ref: /schemas/graph.yaml#/properties/port
61+
description: Input node to receive pixel data.
62+
63+
port@1:
64+
$ref: /schemas/graph.yaml#/properties/port
65+
description: DSI output node to panel.
66+
67+
required:
68+
- port@0
69+
- port@1
70+
71+
required:
72+
- compatible
73+
- reg
74+
- clocks
75+
- clock-names
76+
- resets
77+
- reset-names
78+
- phys
79+
- phy-names
80+
- ports
81+
82+
unevaluatedProperties: false
83+
84+
examples:
85+
- |
86+
dsi@6000 {
87+
compatible = "amlogic,meson-g12a-dw-mipi-dsi";
88+
reg = <0x6000 0x400>;
89+
resets = <&reset_top>;
90+
reset-names = "top";
91+
clocks = <&clk_pclk>, <&bit_clk>, <&clk_px>;
92+
clock-names = "pclk", "bit", "px";
93+
phys = <&mipi_dphy>;
94+
phy-names = "dphy";
95+
96+
ports {
97+
#address-cells = <1>;
98+
#size-cells = <0>;
99+
100+
/* VPU VENC Input */
101+
mipi_dsi_venc_port: port@0 {
102+
reg = <0>;
103+
104+
mipi_dsi_in: endpoint {
105+
remote-endpoint = <&dpi_out>;
106+
};
107+
};
108+
109+
/* DSI Output */
110+
mipi_dsi_panel_port: port@1 {
111+
reg = <1>;
112+
113+
mipi_out_panel: endpoint {
114+
remote-endpoint = <&mipi_in_panel>;
115+
};
116+
};
117+
};
118+
};

Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ properties:
9696
description:
9797
A port node pointing to the HDMI-TX port node.
9898

99+
port@2:
100+
$ref: /schemas/graph.yaml#/properties/port
101+
description:
102+
A port node pointing to the DPI port node (e.g. DSI or LVDS transceiver).
103+
99104
"#address-cells":
100105
const: 1
101106

Documentation/devicetree/bindings/display/bridge/fsl,ldb.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ description: |
1717
properties:
1818
compatible:
1919
enum:
20+
- fsl,imx6sx-ldb
2021
- fsl,imx8mp-ldb
2122
- fsl,imx93-ldb
2223

@@ -64,7 +65,9 @@ allOf:
6465
properties:
6566
compatible:
6667
contains:
67-
const: fsl,imx93-ldb
68+
enum:
69+
- fsl,imx6sx-ldb
70+
- fsl,imx93-ldb
6871
then:
6972
properties:
7073
ports:

Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ properties:
7070
samsung,burst-clock-frequency:
7171
$ref: /schemas/types.yaml#/definitions/uint32
7272
description:
73-
DSIM high speed burst mode frequency.
73+
DSIM high speed burst mode frequency. If absent,
74+
the pixel clock from the attached device or bridge
75+
will be used instead.
7476

7577
samsung,esc-clock-frequency:
7678
$ref: /schemas/types.yaml#/definitions/uint32
@@ -80,7 +82,8 @@ properties:
8082
samsung,pll-clock-frequency:
8183
$ref: /schemas/types.yaml#/definitions/uint32
8284
description:
83-
DSIM oscillator clock frequency.
85+
DSIM oscillator clock frequency. If absent, the clock frequency
86+
of sclk_mipi will be used instead.
8487

8588
phys:
8689
maxItems: 1
@@ -100,20 +103,42 @@ properties:
100103
specified.
101104

102105
port@1:
103-
$ref: /schemas/graph.yaml#/properties/port
106+
$ref: /schemas/graph.yaml#/$defs/port-base
107+
unevaluatedProperties: false
104108
description:
105109
DSI output port node to the panel or the next bridge
106110
in the chain.
107111

112+
properties:
113+
endpoint:
114+
$ref: /schemas/media/video-interfaces.yaml#
115+
unevaluatedProperties: false
116+
117+
properties:
118+
data-lanes:
119+
minItems: 1
120+
maxItems: 4
121+
uniqueItems: true
122+
items:
123+
enum: [ 1, 2, 3, 4 ]
124+
125+
lane-polarities:
126+
minItems: 1
127+
maxItems: 5
128+
description:
129+
The Samsung MIPI DSI IP requires that all the data lanes have
130+
the same polarity.
131+
132+
dependencies:
133+
lane-polarities: [data-lanes]
134+
108135
required:
109136
- clock-names
110137
- clocks
111138
- compatible
112139
- interrupts
113140
- reg
114-
- samsung,burst-clock-frequency
115141
- samsung,esc-clock-frequency
116-
- samsung,pll-clock-frequency
117142

118143
allOf:
119144
- $ref: ../dsi-controller.yaml#

Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ properties:
2121
maxItems: 1
2222
description: virtual channel number of a DSI peripheral
2323

24+
reset-gpios:
25+
maxItems: 1
26+
2427
vddc-supply:
2528
description: Regulator for 1.2V internal core power.
2629

Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,24 @@
44
$id: http://devicetree.org/schemas/display/bridge/toshiba,tc358767.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Toshiba TC358767 eDP bridge
7+
title: Toshiba TC358767/TC358867/TC9595 DSI/DPI/eDP bridge
88

99
maintainers:
1010
- Andrey Gusakov <andrey.gusakov@cogentembedded.com>
1111

12-
description: The TC358767 is bridge device which converts DSI/DPI to eDP/DP
12+
description: |
13+
The TC358767/TC358867/TC9595 is bridge device which
14+
converts DSI/DPI to eDP/DP .
1315
1416
properties:
1517
compatible:
16-
const: toshiba,tc358767
18+
oneOf:
19+
- items:
20+
- enum:
21+
- toshiba,tc358867
22+
- toshiba,tc9595
23+
- const: toshiba,tc358767
24+
- const: toshiba,tc358767
1725

1826
reg:
1927
enum:

Documentation/devicetree/bindings/display/connector/hdmi-connector.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ properties:
3636
description: GPIO signal to enable DDC bus
3737
maxItems: 1
3838

39+
hdmi-pwr-supply:
40+
description: Power supply for the HDMI +5V Power pin
41+
3942
port:
4043
$ref: /schemas/graph.yaml#/properties/port
4144
description: Connection to controller providing HDMI signals

Documentation/devicetree/bindings/display/fsl,lcdif.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- fsl,imx28-lcdif
2222
- fsl,imx6sx-lcdif
2323
- fsl,imx8mp-lcdif
24+
- fsl,imx93-lcdif
2425
- items:
2526
- enum:
2627
- fsl,imx6sl-lcdif
@@ -88,7 +89,9 @@ allOf:
8889
properties:
8990
compatible:
9091
contains:
91-
const: fsl,imx8mp-lcdif
92+
enum:
93+
- fsl,imx8mp-lcdif
94+
- fsl,imx93-lcdif
9295
then:
9396
properties:
9497
clocks:
@@ -107,6 +110,7 @@ allOf:
107110
enum:
108111
- fsl,imx6sx-lcdif
109112
- fsl,imx8mp-lcdif
113+
- fsl,imx93-lcdif
110114
then:
111115
properties:
112116
clocks:
@@ -123,6 +127,7 @@ allOf:
123127
- fsl,imx8mm-lcdif
124128
- fsl,imx8mn-lcdif
125129
- fsl,imx8mp-lcdif
130+
- fsl,imx93-lcdif
126131
then:
127132
required:
128133
- power-domains

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ properties:
2727
- items:
2828
- enum:
2929
- mediatek,mt2712-disp-aal
30+
- mediatek,mt6795-disp-aal
3031
- const: mediatek,mt8173-disp-aal
3132
- items:
3233
- enum:

0 commit comments

Comments
 (0)