Skip to content

Commit ca9e70f

Browse files
committed
Merge tag 'drm-misc-next-2023-08-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.6: UAPI Changes: * virtio: * Support sync objects Cross-subsystem Changes: * dt-bindings: * Move several panel bindings to the correct files * fbcon: * Cleanups * fbdev: * Use _IOMEM_, _SYSMEM_, _DMAMEM_ infixes for initializer macros and Kconfig tokens, update drivers accordingly * ps3fb: Build fix * hid/i2c: * Allow panels and touchscreens to power sequence together * host1x: * Fixes * video: * Fix Kconfig dependencies for boot-up logo Core Changes: * Documentation updates and fixes * Fixes * MIPI-DBI: * Allow using same the D/C GPIO for multiple displays plus driver updates * Tests: * Convert to kunit actions * Fix NULL-deref in drm_exec tests Driver Changes: * armada: * Fixes * ast: * Represent BMV as virtual connector * Report DP connection status * bridge: * dw-hdmi: Support CEC suspend/resume * Support debugfs for chains * Fixes * i915: * Fixes * imx: * Convert to dev_error_probe() * Cleanups * ipu-v3: * Convert to devm_platform_ioremap_resource() in several places * nouveau: * Workaround DPCD issues * panel: * Convert to of_device_get_match_data() * Fix Kconfig dependencies * simple: Set bpc value to fix warning; Set connector type for AUO T215HVN01; Support Innolux G156HCE-L01 plus DT bindings * ili9881: Support TDO TL050HDV35 LCD panel plus DT bindings * startek: Support KD070FHFID015 MIPI-DSI panel plus DT bindings * sitronix-st7789v: Support Inanbo T28CP45TN89 plus DT bindings; Support EDT ET028013DMA plus DT bindings; Various cleanups * edp: Add timings for N140HCA-EAC * Allow panels and touchscreens to power sequence together * Documentation fixes * qaic: * Cleanups * repaper: * Fixes * ssd130x * Fix shadow-plane allocation * Cleanups * tegra: * Convert to devm_platform_ioremap_resource() in several places * Support bridge/connector * Enable PM * Fixes * udl: * Cleanups * v3d: * Fixes * vc4: * Convert tests to kunit actions * virtio: * Support sync objects * vkms: * Support gamma LUT * Fixes Signed-off-by: Dave Airlie <[email protected]> # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmTLwPUACgkQaA3BHVML # eiNRBwf8CTjJJpSppitI6YEDyjG5JjpJPOrw4gmyjPCLMRhIa+ddtz8c6eiAJQTX # Q4RWz4LWF0j/aRdXzxbhCJxLmgMoSbcZYN+jDSoaNbX4Fyi1KXw9eum/HZeMODBO # ScZQFC5iyiCeKHRXZU4+WefqIFTEkEJJll92g3JYlvy793S2TQsA9LB1RIkbwK6x # 0R+TtKSxAq9Gtwn4H0z4ACIzBTuIACxwNQRd6FTIeT4yrd7t+JY3WiBz9M96S6dK # npHyjvJ3Brb88rEzv2eZZUey3fxp7sO7U7DruQVOKkgi4FsltPWxs6Ze9iylXQZr # KcKfW7sxlF2JZlJwT4u0Ur6DMl60eQ== # =K1nU # -----END PGP SIGNATURE----- # gpg: Signature made Fri 04 Aug 2023 01:00:05 AEST # gpg: using RSA key 7217FBAC8CE9CF6344A168E5680DC11D530B7A23 # gpg: Can't check signature: No public key From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20230803150149.GA16884@linux-uq9g
2 parents 2d3563e + a0769f2 commit ca9e70f

File tree

124 files changed

+2782
-549
lines changed

Some content is hidden

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

124 files changed

+2782
-549
lines changed

Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ properties:
4949
description: |
5050
OF device-tree gpio specification for RSTX pin(active low system reset)
5151
52+
interrupts:
53+
maxItems: 1
54+
5255
toshiba,hpd-pin:
5356
$ref: /schemas/types.yaml#/definitions/uint32
5457
enum:

Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- enum:
1919
- bananapi,lhr050h41
2020
- feixin,k101-im2byl02
21+
- tdo,tl050hdv35
2122
- wanchanglong,w552946aba
2223
- const: ilitek,ili9881c
2324

Documentation/devicetree/bindings/display/panel/panel-lvds.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ properties:
4040
items:
4141
- enum:
4242
- auo,b101ew05
43+
# Chunghwa Picture Tubes Ltd. 7" WXGA (800x1280) TFT LCD LVDS panel
44+
- chunghwa,claa070wp03xg
45+
# HannStar Display Corp. HSD101PWW2 10.1" WXGA (1280x800) LVDS panel
46+
- hannstar,hsd101pww2
47+
# Hydis Technologies 7" WXGA (800x1280) TFT LCD LVDS panel
48+
- hydis,hv070wx2-1e0
4349
- tbs,a711-panel
4450

4551
- const: panel-lvds

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ properties:
103103
- cdtech,s070wv95-ct16
104104
# Chefree CH101OLHLWH-002 10.1" (1280x800) color TFT LCD panel
105105
- chefree,ch101olhlwh-002
106-
# Chunghwa Picture Tubes Ltd. 7" WXGA TFT LCD panel
107-
- chunghwa,claa070wp03xg
108106
# Chunghwa Picture Tubes Ltd. 10.1" WXGA TFT LCD panel
109107
- chunghwa,claa101wa01a
110108
# Chunghwa Picture Tubes Ltd. 10.1" WXGA TFT LCD panel
@@ -168,8 +166,6 @@ properties:
168166
- hannstar,hsd070pww1
169167
# HannStar Display Corp. HSD100PXN1 10.1" XGA LVDS panel
170168
- hannstar,hsd100pxn1
171-
# HannStar Display Corp. HSD101PWW2 10.1" WXGA (1280x800) LVDS panel
172-
- hannstar,hsd101pww2
173169
# Hitachi Ltd. Corporation 9" WVGA (800x480) TFT LCD panel
174170
- hit,tx23d38vm0caa
175171
# InfoVision Optoelectronics M133NWF4 R0 13.3" FHD (1920x1080) TFT LCD panel
@@ -196,6 +192,8 @@ properties:
196192
- innolux,n116bge
197193
# InnoLux 13.3" FHD (1920x1080) eDP TFT LCD panel
198194
- innolux,n125hce-gn1
195+
# InnoLux 15.6" FHD (1920x1080) TFT LCD panel
196+
- innolux,g156hce-l01
199197
# InnoLux 15.6" WXGA TFT LCD panel
200198
- innolux,n156bge-l21
201199
# Innolux P120ZDG-BF1 12.02 inch eDP 2K display panel

Documentation/devicetree/bindings/display/panel/sitronix,st7789v.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ allOf:
1515

1616
properties:
1717
compatible:
18-
const: sitronix,st7789v
18+
enum:
19+
- edt,et028013dma
20+
- inanbo,t28cp45tn89-v17
21+
- sitronix,st7789v
1922

2023
reg: true
2124
reset-gpios: true
@@ -26,14 +29,17 @@ properties:
2629
spi-cpha: true
2730
spi-cpol: true
2831

32+
spi-rx-bus-width:
33+
minimum: 0
34+
maximum: 1
35+
2936
dc-gpios:
3037
maxItems: 1
3138
description: DCX pin, Display data/command selection pin in parallel interface
3239

3340
required:
3441
- compatible
3542
- reg
36-
- reset-gpios
3743
- power-supply
3844

3945
unevaluatedProperties: false
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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/startek,kd070fhfid015.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Startek Electronic Technology Co. kd070fhfid015 7 inch TFT LCD panel
8+
9+
maintainers:
10+
- Alexandre Mergnat <[email protected]>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: startek,kd070fhfid015
18+
19+
enable-gpios: true
20+
21+
iovcc-supply:
22+
description: Reference to the regulator powering the panel IO pins.
23+
24+
reg:
25+
maxItems: 1
26+
description: DSI virtual channel
27+
28+
reset-gpios: true
29+
30+
port: true
31+
32+
power-supply: true
33+
34+
additionalProperties: false
35+
36+
required:
37+
- compatible
38+
- enable-gpios
39+
- iovcc-supply
40+
- reg
41+
- reset-gpios
42+
- port
43+
- power-supply
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/gpio/gpio.h>
48+
49+
dsi0 {
50+
#address-cells = <1>;
51+
#size-cells = <0>;
52+
53+
panel@0 {
54+
compatible = "startek,kd070fhfid015";
55+
reg = <0>;
56+
enable-gpios = <&pio 67 GPIO_ACTIVE_HIGH>;
57+
reset-gpios = <&pio 20 GPIO_ACTIVE_HIGH>;
58+
iovcc-supply = <&mt6357_vsim1_reg>;
59+
power-supply = <&vsys_lcm_reg>;
60+
61+
port {
62+
panel_in: endpoint {
63+
remote-endpoint = <&dsi_out>;
64+
};
65+
};
66+
};
67+
};
68+
69+
...

Documentation/devicetree/bindings/input/elan,ekth6915.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ description:
1313
Supports the Elan eKTH6915 touchscreen controller.
1414
This touchscreen controller uses the i2c-hid protocol with a reset GPIO.
1515

16+
allOf:
17+
- $ref: /schemas/input/touchscreen/touchscreen.yaml#
18+
1619
properties:
1720
compatible:
1821
items:
@@ -24,6 +27,8 @@ properties:
2427
interrupts:
2528
maxItems: 1
2629

30+
panel: true
31+
2732
reset-gpios:
2833
description: Reset GPIO; not all touchscreens using eKTH6915 hook this up.
2934

Documentation/devicetree/bindings/input/goodix,gt7375p.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ description:
1414
This touchscreen uses the i2c-hid protocol but has some non-standard
1515
power sequencing required.
1616

17+
allOf:
18+
- $ref: /schemas/input/touchscreen/touchscreen.yaml#
19+
1720
properties:
1821
compatible:
1922
oneOf:
@@ -30,6 +33,8 @@ properties:
3033
interrupts:
3134
maxItems: 1
3235

36+
panel: true
37+
3338
reset-gpios:
3439
true
3540

Documentation/devicetree/bindings/input/hid-over-i2c.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ properties:
4444
description: HID descriptor address
4545
$ref: /schemas/types.yaml#/definitions/uint32
4646

47+
panel: true
48+
4749
post-power-on-delay-ms:
4850
description: Time required by the device after enabling its regulators
4951
or powering it on, before it is ready for communication.

Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ maintainers:
1010
- Dmitry Torokhov <[email protected]>
1111

1212
properties:
13+
panel:
14+
description: If this touchscreen is integrally connected to a panel, this
15+
is a reference to that panel. The presence of this reference indicates
16+
that the touchscreen should be power sequenced together with the panel
17+
and that they may share power and/or reset signals.
18+
$ref: /schemas/types.yaml#/definitions/phandle
19+
1320
touchscreen-min-x:
1421
description: minimum x coordinate reported
1522
$ref: /schemas/types.yaml#/definitions/uint32

0 commit comments

Comments
 (0)