Skip to content

Commit 93b694d

Browse files
committed
Merge tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "Not a major amount of change, the i915 trees got split into display and gt trees to better facilitate higher level review, and there's a major refactoring of i915 GEM locking to use more core kernel concepts (like ww-mutexes). msm gets per-process pagetables, older AMD SI cards get DC support, nouveau got a bump in displayport support with common code extraction from i915. Outside of drm this contains a couple of patches for hexint moduleparams which you've acked, and a virtio common code tree that you should also get via it's regular path. New driver: - Cadence MHDP8546 DisplayPort bridge driver core: - cross-driver scatterlist cleanups - devm_drm conversions - remove drm_dev_init - devm_drm_dev_alloc conversion ttm: - lots of refactoring and cleanups bridges: - chained bridge support in more drivers panel: - misc new panels scheduler: - cleanup priority levels displayport: - refactor i915 code into helpers for nouveau i915: - split into display and GT trees - WW locking refactoring in GEM - execbuf2 extension mechanism - syncobj timeline support - GEN 12 HOBL display powersaving - Rocket Lake display additions - Disable FBC on Tigerlake - Tigerlake Type-C + DP improvements - Hotplug interrupt refactoring amdgpu: - Sienna Cichlid updates - Navy Flounder updates - DCE6 (SI) support for DC - Plane rotation enabled - TMZ state info ioctl - PCIe DPC recovery support - DC interrupt handling refactor - OLED panel fixes amdkfd: - add SMI events for thermal throttling - SMI interface events ioctl update - process eviction counters radeon: - move to dma_ for allocations - expose sclk via sysfs msm: - DSI support for sm8150/sm8250 - per-process GPU pagetable support - Displayport support mediatek: - move HDMI phy driver to PHY - convert mtk-dpi to bridge API - disable mt2701 tmds tegra: - bridge support exynos: - misc cleanups vc4: - dual display cleanups ast: - cleanups gma500: - conversion to GPIOd API hisilicon: - misc reworks ingenic: - clock handling and format improvements mcde: - DSI support mgag200: - desktop g200 support mxsfb: - i.MX7 + i.MX8M - alpha plane support panfrost: - devfreq support - amlogic SoC support ps8640: - EDID from eDP retrieval tidss: - AM65xx YUV workaround virtio: - virtio-gpu exported resources rcar-du: - R8A7742, R8A774E1 and R8A77961 support - YUV planar format fixes - non-visible plane handling - VSP device reference count fix - Kconfig fix to avoid displaying disabled options in .config" * tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm: (1494 commits) drm/ingenic: Fix bad revert drm/amdgpu: Fix invalid number of character '{' in amdgpu_acpi_init drm/amdgpu: Remove warning for virtual_display drm/amdgpu: kfd_initialized can be static drm/amd/pm: setup APU dpm clock table in SMU HW initialization drm/amdgpu: prevent spurious warning drm/amdgpu/swsmu: fix ARC build errors drm/amd/display: Fix OPTC_DATA_FORMAT programming drm/amd/display: Don't allow pstate if no support in blank drm/panfrost: increase readl_relaxed_poll_timeout values MAINTAINERS: Update entry for st7703 driver after the rename Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached" drm/amd/display: HDMI remote sink need mode validation for Linux drm/amd/display: Change to correct unit on audio rate drm/amd/display: Avoid set zero in the requested clk drm/amdgpu: align frag_end to covered address space drm/amdgpu: fix NULL pointer dereference for Renoir drm/vmwgfx: fix regression in thp code due to ttm init refactor. drm/amdgpu/swsmu: add interrupt work handler for smu11 parts drm/amdgpu/swsmu: add interrupt work function ...
2 parents 726eb70 + 640eee0 commit 93b694d

File tree

1,295 files changed

+64955
-20126
lines changed

Some content is hidden

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

1,295 files changed

+64955
-20126
lines changed
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/brcm,bcm2711-hdmi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom BCM2711 HDMI Controller Device Tree Bindings
8+
9+
maintainers:
10+
- Eric Anholt <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- brcm,bcm2711-hdmi0
16+
- brcm,bcm2711-hdmi1
17+
18+
reg:
19+
items:
20+
- description: HDMI controller register range
21+
- description: DVP register range
22+
- description: HDMI PHY register range
23+
- description: Rate Manager register range
24+
- description: Packet RAM register range
25+
- description: Metadata RAM register range
26+
- description: CSC register range
27+
- description: CEC register range
28+
- description: HD register range
29+
30+
reg-names:
31+
items:
32+
- const: hdmi
33+
- const: dvp
34+
- const: phy
35+
- const: rm
36+
- const: packet
37+
- const: metadata
38+
- const: csc
39+
- const: cec
40+
- const: hd
41+
42+
clocks:
43+
items:
44+
- description: The HDMI state machine clock
45+
- description: The Pixel BVB clock
46+
- description: The HDMI Audio parent clock
47+
- description: The HDMI CEC parent clock
48+
49+
clock-names:
50+
items:
51+
- const: hdmi
52+
- const: bvb
53+
- const: audio
54+
- const: cec
55+
56+
ddc:
57+
allOf:
58+
- $ref: /schemas/types.yaml#/definitions/phandle
59+
description: >
60+
Phandle of the I2C controller used for DDC EDID probing
61+
62+
hpd-gpios:
63+
description: >
64+
The GPIO pin for the HDMI hotplug detect (if it doesn't appear
65+
as an interrupt/status bit in the HDMI controller itself)
66+
67+
dmas:
68+
maxItems: 1
69+
description: >
70+
Should contain one entry pointing to the DMA channel used to
71+
transfer audio data.
72+
73+
dma-names:
74+
const: audio-rx
75+
76+
resets:
77+
maxItems: 1
78+
79+
required:
80+
- compatible
81+
- reg
82+
- reg-names
83+
- clocks
84+
- resets
85+
- ddc
86+
87+
additionalProperties: false
88+
89+
examples:
90+
- |
91+
hdmi0: hdmi@7ef00700 {
92+
compatible = "brcm,bcm2711-hdmi0";
93+
reg = <0x7ef00700 0x300>,
94+
<0x7ef00300 0x200>,
95+
<0x7ef00f00 0x80>,
96+
<0x7ef00f80 0x80>,
97+
<0x7ef01b00 0x200>,
98+
<0x7ef01f00 0x400>,
99+
<0x7ef00200 0x80>,
100+
<0x7ef04300 0x100>,
101+
<0x7ef20000 0x100>;
102+
reg-names = "hdmi",
103+
"dvp",
104+
"phy",
105+
"rm",
106+
"packet",
107+
"metadata",
108+
"csc",
109+
"cec",
110+
"hd";
111+
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
112+
clock-names = "hdmi", "bvb", "audio", "cec";
113+
resets = <&dvp 0>;
114+
ddc = <&ddc0>;
115+
};
116+
117+
...

Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,37 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
const: brcm,bcm2835-hvs
14+
enum:
15+
- brcm,bcm2711-hvs
16+
- brcm,bcm2835-hvs
1517

1618
reg:
1719
maxItems: 1
1820

1921
interrupts:
2022
maxItems: 1
2123

24+
clocks:
25+
maxItems: 1
26+
description: Core Clock
27+
2228
required:
2329
- compatible
2430
- reg
2531
- interrupts
2632

2733
additionalProperties: false
2834

35+
if:
36+
properties:
37+
compatible:
38+
contains:
39+
const: brcm,bcm2711-hvs"
40+
41+
then:
42+
required:
43+
- clocks
44+
2945
examples:
3046
- |
3147
hvs@7e400000 {

Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ properties:
1515
- brcm,bcm2835-pixelvalve0
1616
- brcm,bcm2835-pixelvalve1
1717
- brcm,bcm2835-pixelvalve2
18+
- brcm,bcm2711-pixelvalve0
19+
- brcm,bcm2711-pixelvalve1
20+
- brcm,bcm2711-pixelvalve2
21+
- brcm,bcm2711-pixelvalve3
22+
- brcm,bcm2711-pixelvalve4
1823

1924
reg:
2025
maxItems: 1

Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ description: >
1717
properties:
1818
compatible:
1919
enum:
20+
- brcm,bcm2711-vc5
2021
- brcm,bcm2835-vc4
2122
- brcm,cygnus-vc4
2223

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/display/bridge/cdns,mhdp8546.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Cadence MHDP8546 bridge
8+
9+
maintainers:
10+
- Swapnil Jakhade <[email protected]>
11+
- Yuti Amonkar <[email protected]>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- cdns,mhdp8546
17+
- ti,j721e-mhdp8546
18+
19+
reg:
20+
minItems: 1
21+
maxItems: 2
22+
items:
23+
- description:
24+
Register block of mhdptx apb registers up to PHY mapped area (AUX_CONFIG_P).
25+
The AUX and PMA registers are not part of this range, they are instead
26+
included in the associated PHY.
27+
- description:
28+
Register block for DSS_EDP0_INTG_CFG_VP registers in case of TI J7 SoCs.
29+
30+
reg-names:
31+
minItems: 1
32+
maxItems: 2
33+
items:
34+
- const: mhdptx
35+
- const: j721e-intg
36+
37+
clocks:
38+
maxItems: 1
39+
description:
40+
DP bridge clock, used by the IP to know how to translate a number of
41+
clock cycles into a time (which is used to comply with DP standard timings
42+
and delays).
43+
44+
phys:
45+
maxItems: 1
46+
description:
47+
phandle to the DisplayPort PHY.
48+
49+
phy-names:
50+
items:
51+
- const: dpphy
52+
53+
power-domains:
54+
maxItems: 1
55+
56+
interrupts:
57+
maxItems: 1
58+
59+
ports:
60+
type: object
61+
description:
62+
Ports as described in Documentation/devicetree/bindings/graph.txt.
63+
64+
properties:
65+
'#address-cells':
66+
const: 1
67+
68+
'#size-cells':
69+
const: 0
70+
71+
port@0:
72+
type: object
73+
description:
74+
First input port representing the DP bridge input.
75+
76+
port@1:
77+
type: object
78+
description:
79+
Second input port representing the DP bridge input.
80+
81+
port@2:
82+
type: object
83+
description:
84+
Third input port representing the DP bridge input.
85+
86+
port@3:
87+
type: object
88+
description:
89+
Fourth input port representing the DP bridge input.
90+
91+
port@4:
92+
type: object
93+
description:
94+
Output port representing the DP bridge output.
95+
96+
required:
97+
- port@0
98+
- port@4
99+
- '#address-cells'
100+
- '#size-cells'
101+
102+
allOf:
103+
- if:
104+
properties:
105+
compatible:
106+
contains:
107+
const: ti,j721e-mhdp8546
108+
then:
109+
properties:
110+
reg:
111+
minItems: 2
112+
reg-names:
113+
minItems: 2
114+
else:
115+
properties:
116+
reg:
117+
maxItems: 1
118+
reg-names:
119+
maxItems: 1
120+
121+
required:
122+
- compatible
123+
- clocks
124+
- reg
125+
- reg-names
126+
- phys
127+
- phy-names
128+
- interrupts
129+
- ports
130+
131+
additionalProperties: false
132+
133+
examples:
134+
- |
135+
#include <dt-bindings/interrupt-controller/arm-gic.h>
136+
bus {
137+
#address-cells = <2>;
138+
#size-cells = <2>;
139+
140+
mhdp: dp-bridge@f0fb000000 {
141+
compatible = "cdns,mhdp8546";
142+
reg = <0xf0 0xfb000000 0x0 0x1000000>;
143+
reg-names = "mhdptx";
144+
clocks = <&mhdp_clock>;
145+
phys = <&dp_phy>;
146+
phy-names = "dpphy";
147+
interrupts = <GIC_SPI 614 IRQ_TYPE_LEVEL_HIGH>;
148+
149+
ports {
150+
#address-cells = <1>;
151+
#size-cells = <0>;
152+
153+
port@0 {
154+
reg = <0>;
155+
dp_bridge_input: endpoint {
156+
remote-endpoint = <&xxx_dpi_output>;
157+
};
158+
};
159+
160+
port@4 {
161+
reg = <4>;
162+
dp_bridge_output: endpoint {
163+
remote-endpoint = <&xxx_dp_connector_input>;
164+
};
165+
};
166+
};
167+
};
168+
};
169+
...

0 commit comments

Comments
 (0)