Skip to content

Commit 6ea6be7

Browse files
airliedairlied
committed
Merge tag 'drm-misc-next-2020-09-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.10: UAPI Changes: Cross-subsystem Changes: - virtio: Merged a PR for patches that will affect drm/virtio Core Changes: - dev: More devm_drm convertions and removal of drm_dev_init - atomic: Split out drm_atomic_helper_calc_timestamping_constants of drm_atomic_helper_update_legacy_modeset_state - ttm: More rework Driver Changes: - i915: selftests improvements - panfrost: support for Amlogic SoC - vc4: one fix - tree-wide: conversions to devm_drm_dev_alloc, - ast: simplifications of the atomic modesetting code - panfrost: multiple fixes - vc4: multiple fixes Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <maxime@cerno.tech> Link: https://patchwork.freedesktop.org/patch/msgid/20200921152956.2gxnsdgxmwhvjyut@gilmour.lan
2 parents fc88fef + 089d834 commit 6ea6be7

244 files changed

Lines changed: 13125 additions & 5450 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/brcm,bcm2711-hdmi.yaml‎

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 <eric@anholt.net>
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

‎Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2019 NXP
3+
%YAML 1.2
4+
---
5+
$id: "http://devicetree.org/schemas/display/imx/nxp,imx8mq-dcss.yaml#"
6+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
7+
8+
title: iMX8MQ Display Controller Subsystem (DCSS)
9+
10+
maintainers:
11+
- Laurentiu Palcu <laurentiu.palcu@nxp.com>
12+
13+
description:
14+
15+
The DCSS (display controller sub system) is used to source up to three
16+
display buffers, compose them, and drive a display using HDMI 2.0a(with HDCP
17+
2.2) or MIPI-DSI. The DCSS is intended to support up to 4kp60 displays. HDR10
18+
image processing capabilities are included to provide a solution capable of
19+
driving next generation high dynamic range displays.
20+
21+
properties:
22+
compatible:
23+
const: nxp,imx8mq-dcss
24+
25+
reg:
26+
items:
27+
- description: DCSS base address and size, up to IRQ steer start
28+
- description: DCSS BLKCTL base address and size
29+
30+
interrupts:
31+
items:
32+
- description: Context loader completion and error interrupt
33+
- description: DTG interrupt used to signal context loader trigger time
34+
- description: DTG interrupt for Vblank
35+
36+
interrupt-names:
37+
items:
38+
- const: ctxld
39+
- const: ctxld_kick
40+
- const: vblank
41+
42+
clocks:
43+
items:
44+
- description: Display APB clock for all peripheral PIO access interfaces
45+
- description: Display AXI clock needed by DPR, Scaler, RTRAM_CTRL
46+
- description: RTRAM clock
47+
- description: Pixel clock, can be driven either by HDMI phy clock or MIPI
48+
- description: DTRC clock, needed by video decompressor
49+
50+
clock-names:
51+
items:
52+
- const: apb
53+
- const: axi
54+
- const: rtrm
55+
- const: pix
56+
- const: dtrc
57+
58+
assigned-clocks:
59+
items:
60+
- description: Phandle and clock specifier of IMX8MQ_CLK_DISP_AXI_ROOT
61+
- description: Phandle and clock specifier of IMX8MQ_CLK_DISP_RTRM
62+
- description: Phandle and clock specifier of either IMX8MQ_VIDEO2_PLL1_REF_SEL or
63+
IMX8MQ_VIDEO_PLL1_REF_SEL
64+
65+
assigned-clock-parents:
66+
items:
67+
- description: Phandle and clock specifier of IMX8MQ_SYS1_PLL_800M
68+
- description: Phandle and clock specifier of IMX8MQ_SYS1_PLL_800M
69+
- description: Phandle and clock specifier of IMX8MQ_CLK_27M
70+
71+
assigned-clock-rates:
72+
items:
73+
- description: Must be 800 MHz
74+
- description: Must be 400 MHz
75+
76+
port:
77+
type: object
78+
description:
79+
A port node pointing to the input port of a HDMI/DP or MIPI display bridge.
80+
81+
additionalProperties: false
82+
83+
examples:
84+
- |
85+
#include <dt-bindings/clock/imx8mq-clock.h>
86+
dcss: display-controller@32e00000 {
87+
compatible = "nxp,imx8mq-dcss";
88+
reg = <0x32e00000 0x2d000>, <0x32e2f000 0x1000>;
89+
interrupts = <6>, <8>, <9>;
90+
interrupt-names = "ctxld", "ctxld_kick", "vblank";
91+
interrupt-parent = <&irqsteer>;
92+
clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>, <&clk IMX8MQ_CLK_DISP_AXI_ROOT>,
93+
<&clk IMX8MQ_CLK_DISP_RTRM_ROOT>, <&clk IMX8MQ_VIDEO2_PLL_OUT>,
94+
<&clk IMX8MQ_CLK_DISP_DTRC>;
95+
clock-names = "apb", "axi", "rtrm", "pix", "dtrc";
96+
assigned-clocks = <&clk IMX8MQ_CLK_DISP_AXI>, <&clk IMX8MQ_CLK_DISP_RTRM>,
97+
<&clk IMX8MQ_VIDEO2_PLL1_REF_SEL>;
98+
assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_800M>, <&clk IMX8MQ_SYS1_PLL_800M>,
99+
<&clk IMX8MQ_CLK_27M>;
100+
assigned-clock-rates = <800000000>,
101+
<400000000>;
102+
port {
103+
dcss_out: endpoint {
104+
remote-endpoint = <&hdmi_in>;
105+
};
106+
};
107+
};
108+

‎Documentation/devicetree/bindings/display/ssd1307fb.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Optional properties:
1919
- vbat-supply: The supply for VBAT
2020
- solomon,segment-no-remap: Display needs normal (non-inverted) data column
2121
to segment mapping
22+
- solomon,col-offset: Offset of columns (COL/SEG) that the screen is mapped to.
2223
- solomon,com-seq: Display uses sequential COM pin configuration
2324
- solomon,com-lrremap: Display uses left-right COM pin remap
2425
- solomon,com-invdir: Display uses inverted COM pin scan direction

‎Documentation/driver-api/driver-model/devres.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ DMA
263263
dmam_pool_destroy()
264264

265265
DRM
266-
devm_drm_dev_init()
266+
devm_drm_dev_alloc()
267267

268268
GPIO
269269
devm_gpiod_get()

‎Documentation/fb/fbcon.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ A. Configuration
2020
================
2121

2222
The framebuffer console can be enabled by using your favorite kernel
23-
configuration tool. It is under Device Drivers->Graphics Support->Frame
24-
buffer Devices->Console display driver support->Framebuffer Console Support.
23+
configuration tool. It is under Device Drivers->Graphics Support->
24+
Console display driver support->Framebuffer Console Support.
2525
Select 'y' to compile support statically or 'm' for module support. The
2626
module will be fbcon.
2727

‎Documentation/userspace-api/ioctl/ioctl-number.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,6 @@ Code Seq# Include File Comments
356356
0xEC 00-01 drivers/platform/chrome/cros_ec_dev.h ChromeOS EC driver
357357
0xF3 00-3F drivers/usb/misc/sisusbvga/sisusb.h sisfb (in development)
358358
<mailto:thomas@winischhofer.net>
359-
0xF4 00-1F video/mbxfb.h mbxfb
360-
<mailto:raph@8d.com>
361359
0xF6 all LTTng Linux Trace Toolkit Next Generation
362360
<mailto:mathieu.desnoyers@efficios.com>
363361
0xFD all linux/dm-ioctl.h

‎MAINTAINERS‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5411,15 +5411,18 @@ F: drivers/gpu/drm/panel/panel-arm-versatile.c
54115411

54125412
DRM DRIVER FOR ASPEED BMC GFX
54135413
M: Joel Stanley <joel@jms.id.au>
5414-
L: linux-aspeed@lists.ozlabs.org
5414+
L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
54155415
S: Supported
54165416
T: git git://anongit.freedesktop.org/drm/drm-misc
54175417
F: Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
54185418
F: drivers/gpu/drm/aspeed/
54195419

54205420
DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
54215421
M: Dave Airlie <airlied@redhat.com>
5422-
S: Odd Fixes
5422+
R: Thomas Zimmermann <tzimmermann@suse.de>
5423+
L: dri-devel@lists.freedesktop.org
5424+
S: Supported
5425+
T: git git://anongit.freedesktop.org/drm/drm-misc
54235426
F: drivers/gpu/drm/ast/
54245427

54255428
DRM DRIVER FOR BOCHS VIRTUAL GPU
@@ -5507,7 +5510,10 @@ F: include/uapi/drm/mga_drm.h
55075510

55085511
DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
55095512
M: Dave Airlie <airlied@redhat.com>
5510-
S: Odd Fixes
5513+
R: Thomas Zimmermann <tzimmermann@suse.de>
5514+
L: dri-devel@lists.freedesktop.org
5515+
S: Supported
5516+
T: git git://anongit.freedesktop.org/drm/drm-misc
55115517
F: drivers/gpu/drm/mgag200/
55125518

55135519
DRM DRIVER FOR MI0283QT
@@ -5652,13 +5658,15 @@ F: drivers/gpu/drm/panel/panel-tpo-tpg110.c
56525658
DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
56535659
M: Dave Airlie <airlied@redhat.com>
56545660
R: Sean Paul <sean@poorly.run>
5661+
R: Thomas Zimmermann <tzimmermann@suse.de>
56555662
L: dri-devel@lists.freedesktop.org
5656-
S: Odd Fixes
5663+
S: Supported
56575664
T: git git://anongit.freedesktop.org/drm/drm-misc
56585665
F: drivers/gpu/drm/udl/
56595666

56605667
DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
56615668
M: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
5669+
M: Melissa Wen <melissa.srw@gmail.com>
56625670
R: Haneen Mohammed <hamohammed.sa@gmail.com>
56635671
R: Daniel Vetter <daniel@ffwll.ch>
56645672
L: dri-devel@lists.freedesktop.org
@@ -12462,6 +12470,14 @@ F: drivers/iio/gyro/fxas21002c_core.c
1246212470
F: drivers/iio/gyro/fxas21002c_i2c.c
1246312471
F: drivers/iio/gyro/fxas21002c_spi.c
1246412472

12473+
NXP i.MX 8MQ DCSS DRIVER
12474+
M: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
12475+
R: Lucas Stach <l.stach@pengutronix.de>
12476+
L: dri-devel@lists.freedesktop.org
12477+
S: Maintained
12478+
F: Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
12479+
F: drivers/gpu/drm/imx/dcss/
12480+
1246512481
NXP SGTL5000 DRIVER
1246612482
M: Fabio Estevam <festevam@gmail.com>
1246712483
L: alsa-devel@alsa-project.org (moderated for non-subscribers)

0 commit comments

Comments
 (0)