Skip to content

Commit fee54d0

Browse files
committed
Merge tag 'drm-misc-next-2024-03-28' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Two misc-next in one. drm-misc-next for v6.10-rc1: The deal of a lifetime! You get ALL of the previous drm-misc-next-2024-03-21-1 tag!! But WAIT, there's MORE! Cross-subsystem Changes: - Assorted DT binding updates. Core Changes: - Clarify how optional wait_hpd_asserted is. - Shuffle Kconfig names around. Driver Changes: - Assorted build fixes for panthor, imagination, - Add AUO B120XAN01.0 panels. - Assorted small fixes to panthor, panfrost. drm-misc-next for v6.10: UAPI Changes: - Move some nouveau magic constants to uapi. Cross-subsystem Changes: - Move drm-misc to gitlab and freedesktop hosting. - Add entries for panfrost. Core Changes: - Improve placement for TTM bo's in idle/busy handling. - Improve drm/bridge init ordering. - Add CONFIG_DRM_WERROR, and use W=1 for drm. - Assorted documentation updates. - Make more (drm and driver) headers self-contained and add header guards. - Grab reservation lock in pin/unpin callbacks. - Fix reservation lock handling for vmap. - Add edp and edid panel matching, use it to fix a nearly identical panel. Driver Changes: - Add drm/panthor driver and assorted fixes. - Assorted small fixes to xlnx, panel-edp, tidss, ci, nouveau, panel and bridge drivers. - Add Samsung s6e3fa7, BOE NT116WHM-N44, CMN N116BCA-EA1, CrystalClear CMT430B19N00, Startek KD050HDFIA020-C020A, powertip PH128800T006-ZHC01 panels. - Fix console for omapdrm. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 39cd87c + 4b2d588 commit fee54d0

File tree

152 files changed

+15894
-817
lines changed

Some content is hidden

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

152 files changed

+15894
-817
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
What: /sys/bus/platform/drivers/panfrost/.../profiling
2+
Date: February 2024
3+
KernelVersion: 6.8.0
4+
Contact: Adrian Larumbe <[email protected]>
5+
Description:
6+
Get/set drm fdinfo's engine and cycles profiling status.
7+
Valid values are:
8+
0: Don't enable fdinfo job profiling sources.
9+
1: Enable fdinfo job profiling sources, this enables both the GPU's
10+
timestamp and cycle counter registers.

Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ properties:
4141
- enum:
4242
- ti,ds90cf364a # For the DS90CF364A FPD-Link LVDS Receiver
4343
- ti,ds90cf384a # For the DS90CF384A FPD-Link LVDS Receiver
44+
- ti,sn65lvds94 # For the SN65DS94 LVDS serdes
4445
- const: lvds-decoder # Generic LVDS decoders compatible fallback
4546
- enum:
4647
- thine,thc63lvdm83d # For the THC63LVDM83D LVDS serializer

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- ampire,am8001280g
2020
- bananapi,lhr050h41
2121
- feixin,k101-im2byl02
22+
- startek,kd050hdfia020
2223
- tdo,tl050hdv35
2324
- wanchanglong,w552946aba
2425
- const: ilitek,ili9881c

Documentation/devicetree/bindings/display/panel/novatek,nt35950.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ description: |
1919
either bilinear interpolation or pixel duplication.
2020
2121
allOf:
22-
- $ref: panel-common.yaml#
22+
- $ref: panel-common-dual.yaml#
2323

2424
properties:
2525
compatible:
@@ -59,6 +59,7 @@ required:
5959
- avee-supply
6060
- dvdd-supply
6161
- vddio-supply
62+
- ports
6263

6364
additionalProperties: false
6465

Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ description: |
1414
panels. Support video mode panels from China Star Optoelectronics
1515
Technology (CSOT) and BOE Technology.
1616
17-
allOf:
18-
- $ref: panel-common.yaml#
19-
2017
properties:
2118
compatible:
2219
oneOf:
@@ -38,7 +35,6 @@ properties:
3835
description: regulator that supplies the I/O voltage
3936

4037
reg: true
41-
ports: true
4238
rotation: true
4339
backlight: true
4440

@@ -47,7 +43,26 @@ required:
4743
- reg
4844
- vddio-supply
4945
- reset-gpios
50-
- ports
46+
47+
allOf:
48+
- $ref: panel-common-dual.yaml#
49+
- if:
50+
properties:
51+
compatible:
52+
contains:
53+
enum:
54+
- novatek,nt36523w
55+
then:
56+
properties:
57+
ports:
58+
properties:
59+
port@1: false
60+
else:
61+
properties:
62+
port: false
63+
ports:
64+
required:
65+
- port@1
5166

5267
unevaluatedProperties: false
5368

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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/panel-common-dual.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Common Properties for Dual-Link Display Panels
8+
9+
maintainers:
10+
- Thierry Reding <[email protected]>
11+
- Laurent Pinchart <[email protected]>
12+
13+
description:
14+
Properties common for Panel IC supporting dual link panels. Devices might
15+
support also single link.
16+
17+
allOf:
18+
- $ref: panel-common.yaml#
19+
20+
properties:
21+
ports:
22+
$ref: /schemas/graph.yaml#/properties/ports
23+
additionalProperties: false
24+
25+
properties:
26+
port@0:
27+
$ref: /schemas/graph.yaml#/properties/port
28+
description: First link
29+
30+
port@1:
31+
$ref: /schemas/graph.yaml#/properties/port
32+
description: Second link
33+
34+
"#address-cells": true
35+
"#size-cells": true
36+
37+
required:
38+
- port@0
39+
40+
# Single-panel setups are still allowed.
41+
oneOf:
42+
- required:
43+
- ports
44+
- required:
45+
- port
46+
47+
additionalProperties: true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ properties:
5050
- panasonic,vvx10f004b00
5151
# Panasonic 10" WUXGA TFT LCD panel
5252
- panasonic,vvx10f034n00
53+
# Samsung s6e3fa7 1080x2220 based AMS559NK06 AMOLED panel
54+
- samsung,s6e3fa7-ams559nk06
5355
# Samsung s6e3fc2x01 1080x2340 AMOLED panel
5456
- samsung,s6e3fc2x01
5557
# Samsung sofef00 1080x2280 AMOLED panel

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ properties:
9191
- boe,nv133fhm-n62
9292
# BOE NV140FHM-N49 14.0" FHD a-Si FT panel
9393
- boe,nv140fhmn49
94+
# Crystal Clear Technology CMT430B19N00 4.3" 480x272 TFT-LCD panel
95+
- cct,cmt430b19n00
9496
# CDTech(H.K.) Electronics Limited 4.3" 480x272 color TFT-LCD panel
9597
- cdtech,s043wq26h-ct7
9698
# CDTech(H.K.) Electronics Limited 7" WSVGA (1024x600) TFT LCD Panel
@@ -272,6 +274,8 @@ properties:
272274
- osddisplays,osd070t1718-19ts
273275
# One Stop Displays OSD101T2045-53TS 10.1" 1920x1200 panel
274276
- osddisplays,osd101t2045-53ts
277+
# POWERTIP PH128800T006-ZHC01 10.1" WXGA TFT LCD panel
278+
- powertip,ph128800t006-zhc01
275279
# POWERTIP PH800480T013-IDF2 7.0" WVGA TFT LCD panel
276280
- powertip,ph800480t013-idf02
277281
# QiaoDian XianShi Corporation 4"3 TFT LCD panel

Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ properties:
2323
reg: true
2424

2525
backlight: true
26+
width-mm: true
27+
height-mm: true
2628

2729
vddio-supply:
2830
description: VDDIO 1.8V supply
Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpu/arm,mali-valhall-csf.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ARM Mali Valhall GPU
8+
9+
maintainers:
10+
- Liviu Dudau <[email protected]>
11+
- Boris Brezillon <[email protected]>
12+
13+
properties:
14+
$nodename:
15+
pattern: '^gpu@[a-f0-9]+$'
16+
17+
compatible:
18+
oneOf:
19+
- items:
20+
- enum:
21+
- rockchip,rk3588-mali
22+
- const: arm,mali-valhall-csf # Mali Valhall GPU model/revision is fully discoverable
23+
24+
reg:
25+
maxItems: 1
26+
27+
interrupts:
28+
items:
29+
- description: Job interrupt
30+
- description: MMU interrupt
31+
- description: GPU interrupt
32+
33+
interrupt-names:
34+
items:
35+
- const: job
36+
- const: mmu
37+
- const: gpu
38+
39+
clocks:
40+
minItems: 1
41+
maxItems: 3
42+
43+
clock-names:
44+
minItems: 1
45+
items:
46+
- const: core
47+
- const: coregroup
48+
- const: stacks
49+
50+
mali-supply: true
51+
52+
operating-points-v2: true
53+
opp-table:
54+
type: object
55+
56+
power-domains:
57+
minItems: 1
58+
maxItems: 5
59+
60+
power-domain-names:
61+
minItems: 1
62+
maxItems: 5
63+
64+
sram-supply: true
65+
66+
"#cooling-cells":
67+
const: 2
68+
69+
dynamic-power-coefficient:
70+
$ref: /schemas/types.yaml#/definitions/uint32
71+
description:
72+
A u32 value that represents the running time dynamic
73+
power coefficient in units of uW/MHz/V^2. The
74+
coefficient can either be calculated from power
75+
measurements or derived by analysis.
76+
77+
The dynamic power consumption of the GPU is
78+
proportional to the square of the Voltage (V) and
79+
the clock frequency (f). The coefficient is used to
80+
calculate the dynamic power as below -
81+
82+
Pdyn = dynamic-power-coefficient * V^2 * f
83+
84+
where voltage is in V, frequency is in MHz.
85+
86+
dma-coherent: true
87+
88+
required:
89+
- compatible
90+
- reg
91+
- interrupts
92+
- interrupt-names
93+
- clocks
94+
- mali-supply
95+
96+
additionalProperties: false
97+
98+
allOf:
99+
- if:
100+
properties:
101+
compatible:
102+
contains:
103+
const: rockchip,rk3588-mali
104+
then:
105+
properties:
106+
clocks:
107+
minItems: 3
108+
power-domains:
109+
maxItems: 1
110+
power-domain-names: false
111+
112+
examples:
113+
- |
114+
#include <dt-bindings/clock/rockchip,rk3588-cru.h>
115+
#include <dt-bindings/interrupt-controller/irq.h>
116+
#include <dt-bindings/interrupt-controller/arm-gic.h>
117+
#include <dt-bindings/power/rk3588-power.h>
118+
119+
gpu: gpu@fb000000 {
120+
compatible = "rockchip,rk3588-mali", "arm,mali-valhall-csf";
121+
reg = <0xfb000000 0x200000>;
122+
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH 0>,
123+
<GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH 0>,
124+
<GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH 0>;
125+
interrupt-names = "job", "mmu", "gpu";
126+
clock-names = "core", "coregroup", "stacks";
127+
clocks = <&cru CLK_GPU>, <&cru CLK_GPU_COREGROUP>,
128+
<&cru CLK_GPU_STACKS>;
129+
power-domains = <&power RK3588_PD_GPU>;
130+
operating-points-v2 = <&gpu_opp_table>;
131+
mali-supply = <&vdd_gpu_s0>;
132+
sram-supply = <&vdd_gpu_mem_s0>;
133+
134+
gpu_opp_table: opp-table {
135+
compatible = "operating-points-v2";
136+
opp-300000000 {
137+
opp-hz = /bits/ 64 <300000000>;
138+
opp-microvolt = <675000 675000 850000>;
139+
};
140+
opp-400000000 {
141+
opp-hz = /bits/ 64 <400000000>;
142+
opp-microvolt = <675000 675000 850000>;
143+
};
144+
};
145+
};
146+
147+
...

0 commit comments

Comments
 (0)