Skip to content

Commit d32ce5a

Browse files
airliedairlied
committed
Merge tag 'drm-misc-next-2023-10-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.7-rc1: Contains the previous pull request drm-misc-next-2023-10-06 + following: Cross-subsystem Changes: - Rename fb_pgprot to pgprot_framebuffer and remove file argument/ - Update iosys-map documentation typos. Core Changes: - Assorted fixes to drm/panel. - Add HPD state to drm_connector_oob_hotplug_event(), and implement oob hotplug events in bridge connector. - Replace drm_framebuffer_plane_width/height with calls to drm_format_info_plane_width/height. Driver Changes: - Clock and debug fixes for bridge/samsung-dsim. - More btree -> maple tree conversions. - Assorted bugfixes in rockchip, panel-tpo-tpg110, - Add LTK050H3148W-CTA6 panel support. - Assorted small fixes in host1x, tegra, simpledrm. - Suspend fixes for host1x. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 389af78 + c395c83 commit d32ce5a

File tree

105 files changed

+1899
-417
lines changed

Some content is hidden

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

105 files changed

+1899
-417
lines changed

‎Documentation/devicetree/bindings/display/lvds-data-mapping.yaml

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-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/lvds-data-mapping.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: LVDS Data Mapping
8+
9+
maintainers:
10+
- Laurent Pinchart <[email protected]>
11+
- Thierry Reding <[email protected]>
12+
13+
description: |
14+
LVDS is a physical layer specification defined in ANSI/TIA/EIA-644-A. Multiple
15+
incompatible data link layers have been used over time to transmit image data
16+
to LVDS devices. This bindings supports devices compatible with the following
17+
specifications.
18+
19+
[JEIDA] "Digital Interface Standards for Monitor", JEIDA-59-1999, February
20+
1999 (Version 1.0), Japan Electronic Industry Development Association (JEIDA)
21+
[LDI] "Open LVDS Display Interface", May 1999 (Version 0.95), National
22+
Semiconductor
23+
[VESA] "VESA Notebook Panel Standard", October 2007 (Version 1.0), Video
24+
Electronics Standards Association (VESA)
25+
26+
Device compatible with those specifications have been marketed under the
27+
FPD-Link and FlatLink brands.
28+
29+
properties:
30+
data-mapping:
31+
enum:
32+
- jeida-18
33+
- jeida-24
34+
- vesa-24
35+
description: |
36+
The color signals mapping order.
37+
38+
LVDS data mappings are defined as follows.
39+
40+
- "jeida-18" - 18-bit data mapping compatible with the [JEIDA], [LDI] and
41+
[VESA] specifications. Data are transferred as follows on 3 LVDS lanes.
42+
43+
Slot 0 1 2 3 4 5 6
44+
________________ _________________
45+
Clock \_______________________/
46+
______ ______ ______ ______ ______ ______ ______
47+
DATA0 ><__G0__><__R5__><__R4__><__R3__><__R2__><__R1__><__R0__><
48+
DATA1 ><__B1__><__B0__><__G5__><__G4__><__G3__><__G2__><__G1__><
49+
DATA2 ><_CTL2_><_CTL1_><_CTL0_><__B5__><__B4__><__B3__><__B2__><
50+
51+
- "jeida-24" - 24-bit data mapping compatible with the [DSIM] and [LDI]
52+
specifications. Data are transferred as follows on 4 LVDS lanes.
53+
54+
Slot 0 1 2 3 4 5 6
55+
________________ _________________
56+
Clock \_______________________/
57+
______ ______ ______ ______ ______ ______ ______
58+
DATA0 ><__G2__><__R7__><__R6__><__R5__><__R4__><__R3__><__R2__><
59+
DATA1 ><__B3__><__B2__><__G7__><__G6__><__G5__><__G4__><__G3__><
60+
DATA2 ><_CTL2_><_CTL1_><_CTL0_><__B7__><__B6__><__B5__><__B4__><
61+
DATA3 ><_CTL3_><__B1__><__B0__><__G1__><__G0__><__R1__><__R0__><
62+
63+
- "vesa-24" - 24-bit data mapping compatible with the [VESA] specification.
64+
Data are transferred as follows on 4 LVDS lanes.
65+
66+
Slot 0 1 2 3 4 5 6
67+
________________ _________________
68+
Clock \_______________________/
69+
______ ______ ______ ______ ______ ______ ______
70+
DATA0 ><__G0__><__R5__><__R4__><__R3__><__R2__><__R1__><__R0__><
71+
DATA1 ><__B1__><__B0__><__G5__><__G4__><__G3__><__G2__><__G1__><
72+
DATA2 ><_CTL2_><_CTL1_><_CTL0_><__B5__><__B4__><__B3__><__B2__><
73+
DATA3 ><_CTL3_><__B7__><__B6__><__G7__><__G6__><__R7__><__R6__><
74+
75+
Control signals are mapped as follows.
76+
77+
CTL0: HSync
78+
CTL1: VSync
79+
CTL2: Data Enable
80+
CTL3: 0
81+
82+
additionalProperties: true
83+
84+
...

‎Documentation/devicetree/bindings/display/lvds.yaml

Lines changed: 9 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -6,83 +6,24 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: LVDS Display Common Properties
88

9+
allOf:
10+
- $ref: lvds-data-mapping.yaml#
11+
912
maintainers:
1013
- Laurent Pinchart <[email protected]>
1114
- Thierry Reding <[email protected]>
1215

13-
description: |+
14-
LVDS is a physical layer specification defined in ANSI/TIA/EIA-644-A. Multiple
15-
incompatible data link layers have been used over time to transmit image data
16-
to LVDS devices. This bindings supports devices compatible with the following
17-
specifications.
18-
19-
[JEIDA] "Digital Interface Standards for Monitor", JEIDA-59-1999, February
20-
1999 (Version 1.0), Japan Electronic Industry Development Association (JEIDA)
21-
[LDI] "Open LVDS Display Interface", May 1999 (Version 0.95), National
22-
Semiconductor
23-
[VESA] "VESA Notebook Panel Standard", October 2007 (Version 1.0), Video
24-
Electronics Standards Association (VESA)
25-
26-
Device compatible with those specifications have been marketed under the
27-
FPD-Link and FlatLink brands.
16+
description:
17+
This binding extends the data mapping defined in lvds-data-mapping.yaml.
18+
It supports reversing the bit order on the formats defined there in order
19+
to accomodate for even more specialized data formats, since a variety of
20+
data formats and layouts is used to drive LVDS displays.
2821

2922
properties:
30-
data-mapping:
31-
enum:
32-
- jeida-18
33-
- jeida-24
34-
- vesa-24
35-
description: |
36-
The color signals mapping order.
37-
38-
LVDS data mappings are defined as follows.
39-
40-
- "jeida-18" - 18-bit data mapping compatible with the [JEIDA], [LDI] and
41-
[VESA] specifications. Data are transferred as follows on 3 LVDS lanes.
42-
43-
Slot 0 1 2 3 4 5 6
44-
________________ _________________
45-
Clock \_______________________/
46-
______ ______ ______ ______ ______ ______ ______
47-
DATA0 ><__G0__><__R5__><__R4__><__R3__><__R2__><__R1__><__R0__><
48-
DATA1 ><__B1__><__B0__><__G5__><__G4__><__G3__><__G2__><__G1__><
49-
DATA2 ><_CTL2_><_CTL1_><_CTL0_><__B5__><__B4__><__B3__><__B2__><
50-
51-
- "jeida-24" - 24-bit data mapping compatible with the [DSIM] and [LDI]
52-
specifications. Data are transferred as follows on 4 LVDS lanes.
53-
54-
Slot 0 1 2 3 4 5 6
55-
________________ _________________
56-
Clock \_______________________/
57-
______ ______ ______ ______ ______ ______ ______
58-
DATA0 ><__G2__><__R7__><__R6__><__R5__><__R4__><__R3__><__R2__><
59-
DATA1 ><__B3__><__B2__><__G7__><__G6__><__G5__><__G4__><__G3__><
60-
DATA2 ><_CTL2_><_CTL1_><_CTL0_><__B7__><__B6__><__B5__><__B4__><
61-
DATA3 ><_CTL3_><__B1__><__B0__><__G1__><__G0__><__R1__><__R0__><
62-
63-
- "vesa-24" - 24-bit data mapping compatible with the [VESA] specification.
64-
Data are transferred as follows on 4 LVDS lanes.
65-
66-
Slot 0 1 2 3 4 5 6
67-
________________ _________________
68-
Clock \_______________________/
69-
______ ______ ______ ______ ______ ______ ______
70-
DATA0 ><__G0__><__R5__><__R4__><__R3__><__R2__><__R1__><__R0__><
71-
DATA1 ><__B1__><__B0__><__G5__><__G4__><__G3__><__G2__><__G1__><
72-
DATA2 ><_CTL2_><_CTL1_><_CTL0_><__B5__><__B4__><__B3__><__B2__><
73-
DATA3 ><_CTL3_><__B7__><__B6__><__G7__><__G6__><__R7__><__R6__><
74-
75-
Control signals are mapped as follows.
76-
77-
CTL0: HSync
78-
CTL1: VSync
79-
CTL2: Data Enable
80-
CTL3: 0
81-
8223
data-mirror:
8324
type: boolean
8425
description:
85-
If set, reverse the bit order described in the data mappings below on all
26+
If set, reverse the bit order described in the data mappings on all
8627
data lanes, transmitting bits for slots 6 to 0 instead of 0 to 6.
8728

8829
additionalProperties: true

‎Documentation/devicetree/bindings/display/panel/leadtek,ltk050h3146w.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
enum:
1818
- leadtek,ltk050h3146w
1919
- leadtek,ltk050h3146w-a2
20+
- leadtek,ltk050h3148w
2021
reg: true
2122
backlight: true
2223
reset-gpios: true

‎Documentation/devicetree/bindings/display/panel/newvision,nv3051d.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: NewVision NV3051D based LCD panel
88

99
description: |
10-
The NewVision NV3051D is a driver chip used to drive DSI panels. For now,
11-
this driver only supports the 640x480 panels found in the Anbernic RG353
12-
based devices.
10+
The NewVision NV3051D is a driver chip used to drive DSI panels.
1311
1412
maintainers:
1513
- Chris Morgan <[email protected]>
@@ -21,6 +19,7 @@ properties:
2119
compatible:
2220
items:
2321
- enum:
22+
- anbernic,rg351v-panel
2423
- anbernic,rg353p-panel
2524
- anbernic,rg353v-panel
2625
- const: newvision,nv3051d

‎Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ description: |
2121
2222
allOf:
2323
- $ref: panel-common.yaml#
24+
- $ref: ../lvds-data-mapping.yaml#
2425

2526
properties:
26-
2727
compatible:
2828
enum:
2929
# compatible must be listed in alphabetical order, ordered by compatible.
@@ -359,6 +359,17 @@ properties:
359359
power-supply: true
360360
no-hpd: true
361361
hpd-gpios: true
362+
data-mapping: true
363+
364+
if:
365+
not:
366+
properties:
367+
compatible:
368+
contains:
369+
const: innolux,g101ice-l01
370+
then:
371+
properties:
372+
data-mapping: false
362373

363374
additionalProperties: false
364375

@@ -378,3 +389,16 @@ examples:
378389
};
379390
};
380391
};
392+
- |
393+
panel_lvds: panel-lvds {
394+
compatible = "innolux,g101ice-l01";
395+
power-supply = <&vcc_lcd_reg>;
396+
397+
data-mapping = "jeida-24";
398+
399+
port {
400+
panel_in_lvds: endpoint {
401+
remote-endpoint = <&ltdc_out_lvds>;
402+
};
403+
};
404+
};

‎Documentation/devicetree/bindings/display/panel/raydium,rm692e5.yaml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
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/raydium,rm692e5.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Raydium RM692E5 based DSI display panels
8+
9+
maintainers:
10+
- Konrad Dybcio <[email protected]>
11+
12+
description:
13+
The Raydium RM692E5 is a generic DSI Panel IC used to control
14+
AMOLED panels.
15+
16+
allOf:
17+
- $ref: panel-common.yaml#
18+
19+
properties:
20+
compatible:
21+
items:
22+
- const: fairphone,fp5-rm692e5-boe
23+
- const: raydium,rm692e5
24+
25+
dvdd-supply:
26+
description: Digital voltage rail
27+
28+
vci-supply:
29+
description: Analog voltage rail
30+
31+
vddio-supply:
32+
description: I/O voltage rail
33+
34+
reg: true
35+
port: true
36+
37+
required:
38+
- compatible
39+
- reg
40+
- reset-gpios
41+
- dvdd-supply
42+
- vci-supply
43+
- vddio-supply
44+
- port
45+
46+
unevaluatedProperties: false
47+
48+
examples:
49+
- |
50+
#include <dt-bindings/gpio/gpio.h>
51+
52+
dsi {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
panel@0 {
57+
compatible = "fairphone,fp5-rm692e5-boe", "raydium,rm692e5";
58+
reg = <0>;
59+
60+
reset-gpios = <&tlmm 44 GPIO_ACTIVE_LOW>;
61+
dvdd-supply = <&vreg_oled_vci>;
62+
vci-supply = <&vreg_l12c>;
63+
vddio-supply = <&vreg_oled_dvdd>;
64+
65+
port {
66+
panel_in_0: endpoint {
67+
remote-endpoint = <&dsi0_out>;
68+
};
69+
};
70+
};
71+
};
72+
73+
...

‎Documentation/gpu/drivers.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ GPU Driver Documentation
1818
xen-front
1919
afbc
2020
komeda-kms
21+
panfrost
2122

2223
.. only:: subproject and html
2324

‎Documentation/gpu/drm-mm.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -466,40 +466,40 @@ DRM MM Range Allocator Function References
466466
.. kernel-doc:: drivers/gpu/drm/drm_mm.c
467467
:export:
468468

469-
DRM GPU VA Manager
470-
==================
469+
DRM GPUVM
470+
=========
471471

472472
Overview
473473
--------
474474

475-
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
475+
.. kernel-doc:: drivers/gpu/drm/drm_gpuvm.c
476476
:doc: Overview
477477

478478
Split and Merge
479479
---------------
480480

481-
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
481+
.. kernel-doc:: drivers/gpu/drm/drm_gpuvm.c
482482
:doc: Split and Merge
483483

484484
Locking
485485
-------
486486

487-
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
487+
.. kernel-doc:: drivers/gpu/drm/drm_gpuvm.c
488488
:doc: Locking
489489

490490
Examples
491491
--------
492492

493-
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
493+
.. kernel-doc:: drivers/gpu/drm/drm_gpuvm.c
494494
:doc: Examples
495495

496-
DRM GPU VA Manager Function References
497-
--------------------------------------
496+
DRM GPUVM Function References
497+
-----------------------------
498498

499-
.. kernel-doc:: include/drm/drm_gpuva_mgr.h
499+
.. kernel-doc:: include/drm/drm_gpuvm.h
500500
:internal:
501501

502-
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
502+
.. kernel-doc:: drivers/gpu/drm/drm_gpuvm.c
503503
:export:
504504

505505
DRM Buddy Allocator

0 commit comments

Comments
 (0)