Skip to content

Commit 0a19b06

Browse files
committed
Merge tag 'drm-misc-next-2020-06-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v5.9: UAPI Changes: - Add DRM_MODE_TYPE_USERDEF for video modes specified in cmdline. Cross-subsystem Changes: - Assorted devicetree binding updates. - Add might_sleep() to dma_fence_wait(). - Fix fbdev's get_user_pages_fast() handling, and use pin_user_pages. - Small cleanup with IS_BUILTIN in video/fbdev drivers. - Fix video/hdmi coding style for infoframe size. Core Changes: - Silence vblank output during init. - Fix DP-MST corruption during send msg timeout. - Clear leak in drm_gem_objecs_lookup(). - Make newlines work with force connector attribute. - Fix module refcounting error in drm_encoder_slave, and use new i2c api. - Header fix for drm_managed.c - More struct_mutex removal for !legacy drivers: - Remove gem_free_object() - Removal of drm_gem_object_put_unlocked(). - Show current->comm alongside pid in debug printfs. - Add drm_client_modeset_check() + drm_client_framebuffer_flush(). - Replace drm_fb_swab16 with drm_fb_swap that also supports 32-bits. - Remove mode->vrefresh, and compactify drm_display_mode. - Use drm_* macros for logging and warnings. - Add WARN when drm_gem_get_pages is used on a private obj. - Handle importing and imported dmabuf better in shmem helpers. - Small fix for drm/mm hole size comparison, and remove invalid entry optimization. - Add a drm/mm selftest. - Set DSI connector type for DSI panels. - Assorted small fixes and documentation updates. - Fix DDI I2C device registration for MST ports, and flushing on destroy. - Fix master_set return type, used by vmwgfx. - Make the drm_set/drop_master ioctl symmetrical. Driver Changes: Allow iommu in the sun4i driver and use it for sun8i. - Simplify backlight lookup for omap, amba-clcd and tilcdc. - Hold reg_lock for rockchip. - Add support for bridge gpio and lane reordering + polarity to ti-sn65dsi86, and fix clock choice. - Small assorted fixes to tilcdc, vc4, i915, omap, fbdev/sm712fb, fbdev/pxafb, console/newport_con, msm, virtio, udl, malidp, hdlcd, bridge/ti-sn65dsi86, panfrost. - Remove hw cursor support for mgag200, and use simple kms helper + shmem helpers. - Add support for KOE Allow iommu in the sun4i driver and use it for sun8i. - Simplify backlight lookup for omap, amba-clcd and tilcdc. - Hold reg_lock for rockchip. - Add support for bridge gpio and lane reordering + polarity to ti-sn65dsi86, and fix clock choice. - Small assorted fixes to tilcdc, vc4 (multiple), i915. - Remove hw cursor support for mgag200, and use simple kms helper + shmem helpers. - Add support for KOE TX26D202VM0BWA panel. - Use GEM CMA functions in arc, arm, atmel-hlcdc, fsi-dcu, hisilicon, imx, ingenic, komeda, malidp, mcde, meson, msxfb, rcar-du, shmobile, stm, sti, tilcdc, tve200, zte. - Remove gem_print_info. - Improve gem_create_object_helper so udl can use shmem helpers. - Convert vc4 dt bindings to schemas, and add clock properties. - Device initialization cleanups for mgag200. - Add a workaround to fix DP-MST short pulses handling on broken hardware in i915. - Allow build test compiling arm drivers. - Use managed pci functions in mgag200 and ast. - Use dev_groups in malidp. - Add per pixel alpha support for PX30 VOP in rockchip. - Silence deferred probe logs in panfrost. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 4877846 + 114427b commit 0a19b06

File tree

294 files changed

+3568
-3132
lines changed

Some content is hidden

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

294 files changed

+3568
-3132
lines changed

Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ properties:
3636
- const: bus
3737
- const: mod
3838

39+
iommus:
40+
maxItems: 1
41+
3942
resets:
4043
maxItems: 1
4144

Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt

Lines changed: 0 additions & 174 deletions
This file was deleted.
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/brcm,bcm2835-dpi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom VC4 (VideoCore4) DPI Controller
8+
9+
maintainers:
10+
- Eric Anholt <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: brcm,bcm2835-dpi
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
items:
21+
- description: The core clock the unit runs on
22+
- description: The pixel clock that feeds the pixelvalve
23+
24+
clock-names:
25+
items:
26+
- const: core
27+
- const: pixel
28+
29+
port:
30+
type: object
31+
description: >
32+
Port node with a single endpoint connecting to the panel, as
33+
defined in Documentation/devicetree/bindings/media/video-interfaces.txt.
34+
35+
required:
36+
- compatible
37+
- reg
38+
- clocks
39+
- clock-names
40+
- port
41+
42+
additionalProperties: false
43+
44+
examples:
45+
- |
46+
#include <dt-bindings/clock/bcm2835.h>
47+
48+
panel: panel {
49+
compatible = "ontat,yx700wv03", "simple-panel";
50+
51+
port {
52+
panel_in: endpoint {
53+
remote-endpoint = <&dpi_out>;
54+
};
55+
};
56+
};
57+
58+
dpi: dpi@7e208000 {
59+
compatible = "brcm,bcm2835-dpi";
60+
reg = <0x7e208000 0x8c>;
61+
clocks = <&clocks BCM2835_CLOCK_VPU>,
62+
<&clocks BCM2835_CLOCK_DPI>;
63+
clock-names = "core", "pixel";
64+
65+
port {
66+
dpi_out: endpoint {
67+
remote-endpoint = <&panel_in>;
68+
};
69+
};
70+
};
71+
72+
...
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/brcm,bcm2835-dsi0.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom VC4 (VideoCore4) DSI Controller
8+
9+
maintainers:
10+
- Eric Anholt <[email protected]>
11+
12+
properties:
13+
"#clock-cells":
14+
const: 1
15+
16+
compatible:
17+
enum:
18+
- brcm,bcm2835-dsi0
19+
- brcm,bcm2835-dsi1
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
items:
26+
- description: The DSI PLL clock feeding the DSI analog PHY
27+
- description: The DSI ESC clock
28+
- description: The DSI pixel clock
29+
30+
clock-names:
31+
items:
32+
- const: phy
33+
- const: escape
34+
- const: pixel
35+
36+
clock-output-names: true
37+
# FIXME: The meta-schemas don't seem to allow it for now
38+
# items:
39+
# - description: The DSI byte clock for the PHY
40+
# - description: The DSI DDR2 clock
41+
# - description: The DSI DDR clock
42+
43+
interrupts:
44+
maxItems: 1
45+
46+
required:
47+
- "#clock-cells"
48+
- compatible
49+
- reg
50+
- clocks
51+
- clock-names
52+
- clock-output-names
53+
- interrupts
54+
55+
unevaluatedProperties: false
56+
57+
examples:
58+
- |
59+
#include <dt-bindings/clock/bcm2835.h>
60+
61+
dsi1: dsi@7e700000 {
62+
compatible = "brcm,bcm2835-dsi1";
63+
reg = <0x7e700000 0x8c>;
64+
interrupts = <2 12>;
65+
#address-cells = <1>;
66+
#size-cells = <0>;
67+
#clock-cells = <1>;
68+
69+
clocks = <&clocks BCM2835_PLLD_DSI1>,
70+
<&clocks BCM2835_CLOCK_DSI1E>,
71+
<&clocks BCM2835_CLOCK_DSI1P>;
72+
clock-names = "phy", "escape", "pixel";
73+
74+
clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr";
75+
76+
pitouchscreen: panel@0 {
77+
compatible = "raspberrypi,touchscreen";
78+
reg = <0>;
79+
80+
/* ... */
81+
};
82+
};
83+
84+
...

0 commit comments

Comments
 (0)