Skip to content

Commit c18c889

Browse files
committed
Merge tag 'drm-misc-next-2021-11-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.17: UAPI Changes: * Remove restrictions on DMA_BUF_SET_NAME ioctl * connector: State of privacy screen * sysfs: Send hotplug uevent Cross-subsystem Changes: * clk/bmc-2835: Fixes * dma-buf: Add dma_resv selftest; Error-handling fixes; Add debugfs helpers; Remove dma_resv_get_excl_unlocked(); Documentation fixes * pwm: Introduce of_pwm_single_xlate() Core Changes: * Support for privacy screens * Make drm_irq.c legacy * Fix __stack_depot_* name conflict * Documentation fixes * Fixes and cleanups * dp-helper: Reuse 8b/10b link-training delay helpers * format-helper: Update interfaces * fb-helper: Allocate shadow buffer of correct size * gem: Link GEM SHMEM and CMA helpers into separate modules; Use dma_resv iterator; Import DMA_BUF namespace into GEM-helper modules * gem/shmem-helper: Interface cleanups * scheduler: Grab fence in drm_sched_job_add_implicit_dependencies(); Lockdep fixes * kms-helpers: Link several files from core into the KMS-helper module Driver Changes: * Use dma_resv_iter in several places * Fixes and cleanups * amdgpu: Use drm_kms_helper_connector_hotplug_event(); Get all fences at once * bridge: Switch to managed MIPI DSI helpers in several places; Register and attach during probe in several places; Convert to YAML in several places * bridge/anx7625: Support MIPI DPI input; Support HDMI audio; Fixes * bridge/dw-hdmi: Allow interlace on bridge * bridge/ps8640: Enable PM; Support aux-bus * bridge/tc358768: Enabled reference clock; Support pulse mode; Modesetting fixes * bridge/ti-sn65dsi86: Use regmap_bulk_write(); Implement PWM * etnaviv: Get all fences at once * gma500: GEM object cleanups; Remove generic drivers in probe function * i915: Support VESA panel backlights * ingenic: Fixes and cleanups * kirin: Adjust probe order * kmb: Enable framebuffer console * lima: Kconfig fixes * meson: Refactoring to supperot DRM_BRIDGE_ATTACH_NO_ENCODER * msm: Fixes and cleanups * msm/dsi: Adjust probe order * omap: Fixes and cleanups * nouveau: CRC fixes; Validate LUTs in atomic check; Set HDMI AVI RGB quantization to FULL; Fixes and cleanups * panel: Support Innolux G070Y2-T02, Vivax TPC-9150, JDI R63452, Newhaven 1.8-128160EF, Wanchanglong W552964ABA, Novatek NT35950, BOE BF060Y8M, Sony Tulip Truly NT35521; Use dev_err_probe() throughout drivers; Fixes and cleanups * panel/ili9881c: Orientation fixes * radeon: Use dma_resv_wait_timeout() * rockchip: Add timeout for DSP hold; Suspend/resume fixes; PLL clock fixes; Implement mmap in GEM object functions * simpledrm: Support FB_DAMAGE_CLIPS and virtual screen sizes * sun4i: Use CMA helpers without vmap support * tidss: Fixes and cleanups * v3d: Cleanups * vc4: Fix HDMI-CEC hang when display is off; Power on HDMI controller while disabling; Support 4k@60 Hz modes; Fixes and cleanups * video: Convert to sysfs_emit() in several places * video/omapfb: Fix fall-through * virtio: Overflow fixes * xen: Implement mmap as GEM object functions Signed-off-by: Dave Airlie <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 1360572 + a713ca2 commit c18c889

File tree

269 files changed

+10492
-3566
lines changed

Some content is hidden

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

269 files changed

+10492
-3566
lines changed

Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,70 @@ properties:
4343
vdd33-supply:
4444
description: Regulator that provides the supply 3.3V power.
4545

46+
analogix,lane0-swing:
47+
$ref: /schemas/types.yaml#/definitions/uint8-array
48+
minItems: 1
49+
maxItems: 20
50+
description:
51+
an array of swing register setting for DP tx lane0 PHY.
52+
Registers 0~9 are Swing0_Pre0, Swing1_Pre0, Swing2_Pre0,
53+
Swing3_Pre0, Swing0_Pre1, Swing1_Pre1, Swing2_Pre1, Swing0_Pre2,
54+
Swing1_Pre2, Swing0_Pre3, they are for [Boost control] and
55+
[Swing control] setting.
56+
Registers 0~9, bit 3:0 is [Boost control], these bits control
57+
post cursor manual, increase the [Boost control] to increase
58+
Pre-emphasis value.
59+
Registers 0~9, bit 6:4 is [Swing control], these bits control
60+
swing manual, increase [Swing control] setting to add Vp-p value
61+
for each Swing, Pre.
62+
Registers 10~19 are Swing0_Pre0, Swing1_Pre0, Swing2_Pre0,
63+
Swing3_Pre0, Swing0_Pre1, Swing1_Pre1, Swing2_Pre1, Swing0_Pre2,
64+
Swing1_Pre2, Swing0_Pre3, they are for [R select control] and
65+
[R Termination control] setting.
66+
Registers 10~19, bit 4:0 is [R select control], these bits are
67+
compensation manual, increase it can enhance IO driven strength
68+
and Vp-p.
69+
Registers 10~19, bit 5:6 is [R termination control], these bits
70+
adjust 50ohm impedance of DP tx termination. 00:55 ohm,
71+
01:50 ohm(default), 10:45 ohm, 11:40 ohm.
72+
73+
analogix,lane1-swing:
74+
$ref: /schemas/types.yaml#/definitions/uint8-array
75+
minItems: 1
76+
maxItems: 20
77+
description:
78+
an array of swing register setting for DP tx lane1 PHY.
79+
DP TX lane1 swing register setting same with lane0
80+
swing, please refer lane0-swing property description.
81+
82+
analogix,audio-enable:
83+
type: boolean
84+
description: let the driver enable audio HDMI codec function or not.
85+
4686
ports:
4787
$ref: /schemas/graph.yaml#/properties/ports
4888

4989
properties:
5090
port@0:
51-
$ref: /schemas/graph.yaml#/properties/port
91+
$ref: /schemas/graph.yaml#/$defs/port-base
92+
unevaluatedProperties: false
5293
description:
53-
Video port for MIPI DSI input.
94+
MIPI DSI/DPI input.
95+
96+
properties:
97+
endpoint:
98+
$ref: /schemas/media/video-interfaces.yaml#
99+
type: object
100+
additionalProperties: false
101+
102+
properties:
103+
remote-endpoint: true
104+
105+
bus-type:
106+
enum: [1, 5]
107+
default: 1
108+
109+
data-lanes: true
54110

55111
port@1:
56112
$ref: /schemas/graph.yaml#/properties/port
@@ -87,6 +143,9 @@ examples:
87143
vdd10-supply = <&pp1000_mipibrdg>;
88144
vdd18-supply = <&pp1800_mipibrdg>;
89145
vdd33-supply = <&pp3300_mipibrdg>;
146+
analogix,audio-enable;
147+
analogix,lane0-swing = /bits/ 8 <0x14 0x54 0x64 0x74>;
148+
analogix,lane1-swing = /bits/ 8 <0x14 0x54 0x64 0x74>;
90149
91150
ports {
92151
#address-cells = <1>;
@@ -96,6 +155,8 @@ examples:
96155
reg = <0>;
97156
anx7625_in: endpoint {
98157
remote-endpoint = <&mipi_dsi>;
158+
bus-type = <5>;
159+
data-lanes = <0 1 2 3>;
99160
};
100161
};
101162
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
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/nxp,ptn3460.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP PTN3460 eDP to LVDS bridge
8+
9+
maintainers:
10+
- Sean Paul <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: nxp,ptn3460
15+
16+
reg:
17+
description: I2C address of the bridge
18+
maxItems: 1
19+
20+
edid-emulation:
21+
$ref: "/schemas/types.yaml#/definitions/uint32"
22+
description:
23+
The EDID emulation entry to use
24+
Value Resolution Description
25+
0 1024x768 NXP Generic
26+
1 1920x1080 NXP Generic
27+
2 1920x1080 NXP Generic
28+
3 1600x900 Samsung LTM200KT
29+
4 1920x1080 Samsung LTM230HT
30+
5 1366x768 NXP Generic
31+
6 1600x900 ChiMei M215HGE
32+
enum: [0, 1, 2, 3, 4, 5, 6]
33+
34+
powerdown-gpios:
35+
description: GPIO connected to the PD_N signal.
36+
maxItems: 1
37+
38+
reset-gpios:
39+
description: GPIO connected to the RST_N signal.
40+
maxItems: 1
41+
42+
ports:
43+
$ref: /schemas/graph.yaml#/properties/ports
44+
45+
properties:
46+
port@0:
47+
$ref: /schemas/graph.yaml#/properties/port
48+
description:
49+
Video port for LVDS output
50+
51+
port@1:
52+
$ref: /schemas/graph.yaml#/properties/port
53+
description:
54+
Video port for eDP input
55+
56+
required:
57+
- port@0
58+
- port@1
59+
60+
required:
61+
- compatible
62+
- reg
63+
- edid-emulation
64+
- powerdown-gpios
65+
- reset-gpios
66+
- ports
67+
68+
additionalProperties: false
69+
70+
examples:
71+
- |
72+
#include <dt-bindings/gpio/gpio.h>
73+
74+
i2c1 {
75+
#address-cells = <1>;
76+
#size-cells = <0>;
77+
78+
bridge@20 {
79+
compatible = "nxp,ptn3460";
80+
reg = <0x20>;
81+
edid-emulation = <5>;
82+
powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>;
83+
reset-gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
84+
85+
ports {
86+
#address-cells = <1>;
87+
#size-cells = <0>;
88+
89+
port@0 {
90+
reg = <0>;
91+
bridge_out: endpoint {
92+
remote-endpoint = <&panel_in>;
93+
};
94+
};
95+
96+
port@1 {
97+
reg = <1>;
98+
bridge_in: endpoint {
99+
remote-endpoint = <&dp_out>;
100+
};
101+
};
102+
};
103+
};
104+
};
105+
106+
...

Documentation/devicetree/bindings/display/bridge/ptn3460.txt

Lines changed: 0 additions & 39 deletions
This file was deleted.

Documentation/devicetree/bindings/display/bridge/sii9234.txt

Lines changed: 0 additions & 49 deletions
This file was deleted.
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
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/sil,sii9234.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Silicon Image SiI9234 HDMI/MHL bridge
8+
9+
maintainers:
10+
- Maciej Purski <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: sil,sii9234
15+
16+
reg:
17+
description: I2C address for TPI interface
18+
maxItems: 1
19+
20+
avcc12-supply:
21+
description: TMDS Analog Supply Voltage, 1.2V
22+
23+
avcc33-supply:
24+
description: MHL/USB Switch Supply Voltage, 3.3V
25+
26+
cvcc12-supply:
27+
description: Digital Core Supply Voltage, 1.2V
28+
29+
iovcc18-supply:
30+
description: I/O voltage supply, 1.8V
31+
32+
interrupts:
33+
maxItems: 1
34+
35+
reset-gpios:
36+
description: GPIO connected to the reset pin.
37+
maxItems: 1
38+
39+
ports:
40+
$ref: /schemas/graph.yaml#/properties/ports
41+
42+
properties:
43+
port@0:
44+
$ref: /schemas/graph.yaml#/properties/port
45+
description:
46+
Video port for HDMI (encoder) input
47+
48+
port@1:
49+
$ref: /schemas/graph.yaml#/properties/port
50+
description:
51+
MHL to connector port
52+
53+
required:
54+
- port@0
55+
56+
required:
57+
- compatible
58+
- reg
59+
- avcc12-supply
60+
- avcc33-supply
61+
- cvcc12-supply
62+
- iovcc18-supply
63+
- interrupts
64+
- reset-gpios
65+
- ports
66+
67+
additionalProperties: false
68+
69+
examples:
70+
- |
71+
#include <dt-bindings/gpio/gpio.h>
72+
#include <dt-bindings/interrupt-controller/irq.h>
73+
74+
i2c1 {
75+
#address-cells = <1>;
76+
#size-cells = <0>;
77+
78+
bridge@39 {
79+
compatible = "sil,sii9234";
80+
reg = <0x39>;
81+
avcc12-supply = <&vsil12>;
82+
avcc33-supply = <&vcc33mhl>;
83+
cvcc12-supply = <&vsil12>;
84+
iovcc18-supply = <&vcc18mhl>;
85+
interrupt-parent = <&gpf3>;
86+
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
87+
reset-gpios = <&gpf3 4 GPIO_ACTIVE_LOW>;
88+
89+
ports {
90+
#address-cells = <1>;
91+
#size-cells = <0>;
92+
93+
port@0 {
94+
reg = <0>;
95+
mhl_to_hdmi: endpoint {
96+
remote-endpoint = <&hdmi_to_mhl>;
97+
};
98+
};
99+
100+
port@1 {
101+
reg = <1>;
102+
mhl_to_connector: endpoint {
103+
remote-endpoint = <&connector_to_mhl>;
104+
};
105+
};
106+
};
107+
};
108+
};
109+
110+
...

0 commit comments

Comments
 (0)