Skip to content

Commit b8f55f2

Browse files
committed
Merge tag 'drm-misc-next-2023-01-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for $kernel-version: UAPI Changes: Cross-subsystem Changes: Core Changes: * Cleanup unneeded include statements wrt <linux/fb.h>, <drm/drm_fb_helper.h> and <drm/drm_crtc_helper.h> * Remove unused helper DRM_DEBUG_KMS_RATELIMITED() * fbdev: Remove obsolete aperture field from struct fb_device, plus driver cleanups; Remove unused flag FBINFO_MISC_FIRMWARE * MIPI-DSI: Fix brightness, plus rsp. driver updates * scheduler: Deprecate drm_sched_resubmit_jobs() * ttm: Fix MIPS build; Remove ttm_bo_wait(); Documentation fixes Driver Changes: * Remove obsolete drivers for userspace modesetting i810, mga, r128, savage, sis, tdfx, via * bridge: Support CDNS DSI J721E, plus DT bindings; lt9611: Various fixes and improvements; sil902x: Various fixes; Fixes * nouveau: Removed support for legacy ioctls; Replace zero-size array; Cleanups * panel: Fixes * radeon: Use new DRM logging helpers Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/Y8kDk5YX7Yz3eRhM@linux-uq9g
2 parents 045e8d1 + bd43a98 commit b8f55f2

211 files changed

Lines changed: 901 additions & 20794 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/bridge/cdns,dsi.txt

Lines changed: 0 additions & 112 deletions
This file was deleted.
Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
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,dsi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cadence DSI bridge
8+
9+
maintainers:
10+
- Boris Brezillon <boris.brezillon@bootlin.com>
11+
12+
description: |
13+
CDNS DSI is a bridge device which converts DPI to DSI
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- cdns,dsi
19+
- ti,j721e-dsi
20+
21+
reg:
22+
minItems: 1
23+
items:
24+
- description:
25+
Register block for controller's registers.
26+
- description:
27+
Register block for wrapper settings registers in case of TI J7 SoCs.
28+
29+
clocks:
30+
items:
31+
- description: PSM clock, used by the IP
32+
- description: sys clock, used by the IP
33+
34+
clock-names:
35+
items:
36+
- const: dsi_p_clk
37+
- const: dsi_sys_clk
38+
39+
phys:
40+
maxItems: 1
41+
42+
phy-names:
43+
const: dphy
44+
45+
interrupts:
46+
maxItems: 1
47+
48+
resets:
49+
maxItems: 1
50+
51+
reset-names:
52+
const: dsi_p_rst
53+
54+
ports:
55+
$ref: /schemas/graph.yaml#/properties/ports
56+
57+
properties:
58+
port@0:
59+
$ref: /schemas/graph.yaml#/properties/port
60+
description:
61+
Output port representing the DSI output. It can have
62+
at most 4 endpoints. The endpoint number is directly encoding
63+
the DSI virtual channel used by this device.
64+
65+
port@1:
66+
$ref: /schemas/graph.yaml#/properties/port
67+
description:
68+
Input port representing the DPI input.
69+
70+
required:
71+
- port@1
72+
73+
allOf:
74+
- $ref: ../dsi-controller.yaml#
75+
76+
- if:
77+
properties:
78+
compatible:
79+
contains:
80+
const: ti,j721e-dsi
81+
then:
82+
properties:
83+
reg:
84+
minItems: 2
85+
maxItems: 2
86+
power-domains:
87+
maxItems: 1
88+
else:
89+
properties:
90+
reg:
91+
maxItems: 1
92+
93+
required:
94+
- compatible
95+
- reg
96+
- interrupts
97+
- clocks
98+
- clock-names
99+
- phys
100+
- phy-names
101+
- ports
102+
103+
unevaluatedProperties: false
104+
105+
examples:
106+
- |
107+
bus {
108+
#address-cells = <2>;
109+
#size-cells = <2>;
110+
111+
dsi@fd0c0000 {
112+
compatible = "cdns,dsi";
113+
reg = <0x0 0xfd0c0000 0x0 0x1000>;
114+
clocks = <&pclk>, <&sysclk>;
115+
clock-names = "dsi_p_clk", "dsi_sys_clk";
116+
interrupts = <1>;
117+
phys = <&dphy0>;
118+
phy-names = "dphy";
119+
120+
#address-cells = <1>;
121+
#size-cells = <0>;
122+
123+
ports {
124+
#address-cells = <1>;
125+
#size-cells = <0>;
126+
127+
port@1 {
128+
reg = <1>;
129+
endpoint {
130+
remote-endpoint = <&xxx_dpi_output>;
131+
};
132+
};
133+
};
134+
135+
panel@0 {
136+
compatible = "panasonic,vvx10f034n00";
137+
reg = <0>;
138+
power-supply = <&vcc_lcd_reg>;
139+
};
140+
};
141+
};
142+
143+
- |
144+
bus {
145+
#address-cells = <2>;
146+
#size-cells = <2>;
147+
148+
dsi@fd0c0000 {
149+
compatible = "cdns,dsi";
150+
reg = <0x0 0xfd0c0000 0x0 0x1000>;
151+
clocks = <&pclk>, <&sysclk>;
152+
clock-names = "dsi_p_clk", "dsi_sys_clk";
153+
interrupts = <1>;
154+
phys = <&dphy1>;
155+
phy-names = "dphy";
156+
157+
ports {
158+
#address-cells = <1>;
159+
#size-cells = <0>;
160+
161+
port@0 {
162+
reg = <0>;
163+
#address-cells = <1>;
164+
#size-cells = <0>;
165+
166+
endpoint@0 {
167+
reg = <0>;
168+
remote-endpoint = <&dsi_panel_input>;
169+
};
170+
};
171+
172+
port@1 {
173+
reg = <1>;
174+
endpoint {
175+
remote-endpoint = <&xxx_dpi_output>;
176+
};
177+
};
178+
};
179+
};
180+
};

Documentation/devicetree/bindings/display/bridge/renesas,dsi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
items:
2323
- enum:
2424
- renesas,r9a07g044-mipi-dsi # RZ/G2{L,LC}
25+
- renesas,r9a07g054-mipi-dsi # RZ/V2L
2526
- const: renesas,rzg2l-mipi-dsi
2627

2728
reg:

MAINTAINERS

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6579,11 +6579,6 @@ T: git git://anongit.freedesktop.org/drm/drm-misc
65796579
F: Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
65806580
F: drivers/gpu/drm/tiny/ili9486.c
65816581

6582-
DRM DRIVER FOR INTEL I810 VIDEO CARDS
6583-
S: Orphan / Obsolete
6584-
F: drivers/gpu/drm/i810/
6585-
F: include/uapi/drm/i810_drm.h
6586-
65876582
DRM DRIVER FOR JADARD JD9365DA-H3 MIPI-DSI LCD PANELS
65886583
M: Jagan Teki <jagan@edgeble.ai>
65896584
S: Maintained
@@ -6612,11 +6607,6 @@ S: Maintained
66126607
F: Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml
66136608
F: drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
66146609

6615-
DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
6616-
S: Orphan / Obsolete
6617-
F: drivers/gpu/drm/mga/
6618-
F: include/uapi/drm/mga_drm.h
6619-
66206610
DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
66216611
M: Dave Airlie <airlied@redhat.com>
66226612
R: Thomas Zimmermann <tzimmermann@suse.de>
@@ -6735,11 +6725,6 @@ T: git git://anongit.freedesktop.org/drm/drm-misc
67356725
F: drivers/gpu/drm/qxl/
67366726
F: include/uapi/drm/qxl_drm.h
67376727

6738-
DRM DRIVER FOR RAGE 128 VIDEO CARDS
6739-
S: Orphan / Obsolete
6740-
F: drivers/gpu/drm/r128/
6741-
F: include/uapi/drm/r128_drm.h
6742-
67436728
DRM DRIVER FOR RAYDIUM RM67191 PANELS
67446729
M: Robert Chiras <robert.chiras@nxp.com>
67456730
S: Maintained
@@ -6767,11 +6752,6 @@ S: Maintained
67676752
F: Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
67686753
F: drivers/gpu/drm/panel/panel-sitronix-st7703.c
67696754

6770-
DRM DRIVER FOR SAVAGE VIDEO CARDS
6771-
S: Orphan / Obsolete
6772-
F: drivers/gpu/drm/savage/
6773-
F: include/uapi/drm/savage_drm.h
6774-
67756755
DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
67766756
M: Thomas Zimmermann <tzimmermann@suse.de>
67776757
M: Javier Martinez Canillas <javierm@redhat.com>
@@ -6787,11 +6767,6 @@ F: include/drm/drm_aperture.h
67876767
F: include/linux/aperture.h
67886768
F: include/video/nomodeset.h
67896769

6790-
DRM DRIVER FOR SIS VIDEO CARDS
6791-
S: Orphan / Obsolete
6792-
F: drivers/gpu/drm/sis/
6793-
F: include/uapi/drm/sis_drm.h
6794-
67956770
DRM DRIVER FOR SITRONIX ST7586 PANELS
67966771
M: David Lechner <david@lechnology.com>
67976772
S: Maintained
@@ -6819,10 +6794,6 @@ T: git git://anongit.freedesktop.org/drm/drm-misc
68196794
F: Documentation/devicetree/bindings/display/ste,mcde.yaml
68206795
F: drivers/gpu/drm/mcde/
68216796

6822-
DRM DRIVER FOR TDFX VIDEO CARDS
6823-
S: Orphan / Obsolete
6824-
F: drivers/gpu/drm/tdfx/
6825-
68266797
DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
68276798
M: Jagan Teki <jagan@amarulasolutions.com>
68286799
S: Maintained

0 commit comments

Comments
 (0)