Skip to content

Commit 4145cb5

Browse files
committed
Merge tag 'drm-misc-next-2020-07-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v5.9: UAPI Changes: Cross-subsystem Changes: - Convert panel-dsi-cm and ingenic bindings to YAML. - Add lockdep annotations for dma-fence. \o/ - Describe why indefinite fences are a bad idea - Update binding for rocktech jh057n00900. Core Changes: - Add vblank workers. - Use spin_(un)lock_irq instead of the irqsave/restore variants in crtc code. - Add managed vram helpers. - Convert more logging to drm functions. - Replace more http links with https in core and drivers. - Cleanup to ttm iomem functions and implementation. - Remove TTM CMA memtype as it doesn't work correctly. - Remove TTM_MEMTYPE_FLAG_MAPPABLE for many drivers that have no unmappable memory resources. Driver Changes: - Add CRC support to nouveau, using the new vblank workers. - Dithering and atomic state fix for nouveau. - Fixes for Frida FRD350H54004 panel. - Add support for OSD mode (sprite planes), IPU (scaling) and multiple panels/bridges to ingenic. - Use managed vram helpers in ast. - Assorted small fixes to ingenic, i810, mxsfb. - Remove optional unused ttm dummy functions. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 3ffff3c + acc0c39 commit 4145cb5

File tree

102 files changed

+4397
-782
lines changed

Some content is hidden

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

102 files changed

+4397
-782
lines changed

Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ examples:
165165
- |
166166
167167
#include <dt-bindings/clock/imx8mq-clock.h>
168+
#include <dt-bindings/gpio/gpio.h>
168169
#include <dt-bindings/interrupt-controller/arm-gic.h>
169170
#include <dt-bindings/reset/imx8mq-reset.h>
170171
@@ -191,12 +192,12 @@ examples:
191192
phy-names = "dphy";
192193
193194
panel@0 {
194-
#address-cells = <1>;
195-
#size-cells = <0>;
196195
compatible = "rocktech,jh057n00900";
197196
reg = <0>;
198-
port@0 {
199-
reg = <0>;
197+
vcc-supply = <&reg_2v8_p>;
198+
iovcc-supply = <&reg_1v8_p>;
199+
reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;
200+
port {
200201
panel_in: endpoint {
201202
remote-endpoint = <&mipi_dsi_out>;
202203
};
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/ingenic,ipu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ingenic SoCs Image Processing Unit (IPU) devicetree bindings
8+
9+
maintainers:
10+
- Paul Cercueil <[email protected]>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- enum:
16+
- ingenic,jz4725b-ipu
17+
- ingenic,jz4760-ipu
18+
- items:
19+
- const: ingenic,jz4770-ipu
20+
- const: ingenic,jz4760-ipu
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
clocks:
29+
maxItems: 1
30+
31+
clock-names:
32+
const: ipu
33+
34+
patternProperties:
35+
"^ports?$":
36+
description: OF graph bindings (specified in bindings/graph.txt).
37+
38+
required:
39+
- compatible
40+
- reg
41+
- interrupts
42+
- clocks
43+
- clock-names
44+
45+
additionalProperties: false
46+
47+
examples:
48+
- |
49+
#include <dt-bindings/clock/jz4770-cgu.h>
50+
ipu@13080000 {
51+
compatible = "ingenic,jz4770-ipu", "ingenic,jz4760-ipu";
52+
reg = <0x13080000 0x800>;
53+
54+
interrupt-parent = <&intc>;
55+
interrupts = <29>;
56+
57+
clocks = <&cgu JZ4770_CLK_IPU>;
58+
clock-names = "ipu";
59+
60+
port {
61+
ipu_ep: endpoint {
62+
remote-endpoint = <&lcdc_ep>;
63+
};
64+
};
65+
};

Documentation/devicetree/bindings/display/ingenic,lcd.txt

Lines changed: 0 additions & 45 deletions
This file was deleted.
Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/ingenic,lcd.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ingenic SoCs LCD controller devicetree bindings
8+
9+
maintainers:
10+
- Paul Cercueil <[email protected]>
11+
12+
properties:
13+
$nodename:
14+
pattern: "^lcd-controller@[0-9a-f]+$"
15+
16+
compatible:
17+
enum:
18+
- ingenic,jz4740-lcd
19+
- ingenic,jz4725b-lcd
20+
- ingenic,jz4770-lcd
21+
- ingenic,jz4780-lcd
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
clocks:
30+
items:
31+
- description: Pixel clock
32+
- description: Module clock
33+
minItems: 1
34+
35+
clock-names:
36+
items:
37+
- const: lcd_pclk
38+
- const: lcd
39+
minItems: 1
40+
41+
port:
42+
description: OF graph bindings (specified in bindings/graph.txt).
43+
44+
ports:
45+
description: OF graph bindings (specified in bindings/graph.txt).
46+
type: object
47+
properties:
48+
port@0:
49+
type: object
50+
description: DPI output, to interface with TFT panels.
51+
52+
port@8:
53+
type: object
54+
description: Link to the Image Processing Unit (IPU).
55+
(See ingenic,ipu.yaml).
56+
57+
required:
58+
- port@0
59+
60+
required:
61+
- compatible
62+
- reg
63+
- interrupts
64+
- clocks
65+
- clock-names
66+
67+
if:
68+
properties:
69+
compatible:
70+
contains:
71+
enum:
72+
- ingenic,jz4740-lcd
73+
- ingenic,jz4780-lcd
74+
then:
75+
properties:
76+
clocks:
77+
minItems: 2
78+
clock-names:
79+
minItems: 2
80+
else:
81+
properties:
82+
clocks:
83+
maxItems: 1
84+
clock-names:
85+
maxItems: 1
86+
87+
additionalProperties: false
88+
89+
examples:
90+
- |
91+
#include <dt-bindings/clock/jz4740-cgu.h>
92+
lcd-controller@13050000 {
93+
compatible = "ingenic,jz4740-lcd";
94+
reg = <0x13050000 0x1000>;
95+
96+
interrupt-parent = <&intc>;
97+
interrupts = <30>;
98+
99+
clocks = <&cgu JZ4740_CLK_LCD_PCLK>, <&cgu JZ4740_CLK_LCD>;
100+
clock-names = "lcd_pclk", "lcd";
101+
102+
port {
103+
endpoint {
104+
remote-endpoint = <&panel_input>;
105+
};
106+
};
107+
};
108+
109+
- |
110+
#include <dt-bindings/clock/jz4725b-cgu.h>
111+
lcd-controller@13050000 {
112+
compatible = "ingenic,jz4725b-lcd";
113+
reg = <0x13050000 0x1000>;
114+
115+
interrupt-parent = <&intc>;
116+
interrupts = <31>;
117+
118+
clocks = <&cgu JZ4725B_CLK_LCD>;
119+
clock-names = "lcd_pclk";
120+
121+
port {
122+
endpoint {
123+
remote-endpoint = <&panel_input>;
124+
};
125+
};
126+
};

Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/panel-dsi-cm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: DSI command mode panels
8+
9+
maintainers:
10+
- Tomi Valkeinen <[email protected]>
11+
- Sebastian Reichel <[email protected]>
12+
13+
description: |
14+
This binding file is a collection of the DSI panels that
15+
are usually driven in command mode. If no backlight is
16+
referenced via the optional backlight property, the DSI
17+
panel is assumed to have native backlight support.
18+
The panel may use an OF graph binding for the association
19+
to the display, or it may be a direct child node of the
20+
display.
21+
22+
allOf:
23+
- $ref: panel-common.yaml#
24+
25+
properties:
26+
27+
compatible:
28+
items:
29+
- enum:
30+
- motorola,droid4-panel # Panel from Motorola Droid4 phone
31+
- nokia,himalaya # Panel from Nokia N950 phone
32+
- tpo,taal # Panel from OMAP4 SDP board
33+
- const: panel-dsi-cm # Generic DSI command mode panel compatible fallback
34+
35+
reg:
36+
maxItems: 1
37+
description: DSI virtual channel
38+
39+
vddi-supply:
40+
description:
41+
Display panels require power to be supplied. While several panels need
42+
more than one power supply with panel-specific constraints governing the
43+
order and timings of the power supplies, in many cases a single power
44+
supply is sufficient, either because the panel has a single power rail, or
45+
because all its power rails can be driven by the same supply. In that case
46+
the vddi-supply property specifies the supply powering the panel as a
47+
phandle to a regulator.
48+
49+
vpnl-supply:
50+
description:
51+
When the display panel needs a second power supply, this property can be
52+
used in addition to vddi-supply. Both supplies will be enabled at the
53+
same time before the panel is being accessed.
54+
55+
width-mm: true
56+
height-mm: true
57+
label: true
58+
rotation: true
59+
panel-timing: true
60+
port: true
61+
reset-gpios: true
62+
te-gpios: true
63+
backlight: true
64+
65+
additionalProperties: false
66+
67+
required:
68+
- compatible
69+
- reg
70+
71+
examples:
72+
- |
73+
#include <dt-bindings/gpio/gpio.h>
74+
75+
dsi-controller {
76+
#address-cells = <1>;
77+
#size-cells = <0>;
78+
79+
panel@0 {
80+
compatible = "tpo,taal", "panel-dsi-cm";
81+
reg = <0>;
82+
reset-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;
83+
};
84+
};
85+
86+
...

Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
# Xingbangda XBD599 5.99" 720x1440 TFT LCD panel
2525
- xingbangda,xbd599
2626

27+
port: true
2728
reg:
2829
maxItems: 1
2930
description: DSI virtual channel

0 commit comments

Comments
 (0)