Skip to content

Commit cfeeb0b

Browse files
committed
Merge tag 'drm-misc-next-2021-07-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v5.15: UAPI Changes: - Add modifiers for arm fixed rate compression. Cross-subsystem Changes: - Assorted dt binding fixes. - Convert ssd1307fb to json-schema. - Update a lot of irc channels to point to OFTC, as everyone moved there. - Fix the same divide by zero for asilantfb, kyro, rivafb. Core Changes: - Document requirements for new atomic properties. - Add drm_gem_fb_(begin/end)_cpu_access helpers, and use them in some drivers. - Document drm_property_enum.value for bitfields. - Add explicit _NO_ for MIPI_DSI flags that disable features. - Assorted documentation fixes. - Update fb_damage handling, and move drm_plane_enable_fb_damage_clips to core. - Add logging and docs to RMFB ioctl. - Assorted small fixes to dp_mst, master handling. - Clarify drm lease usage. Driver Changes: - Assorted small fixes to panfrost, hibmc, bridge/nwl-dsi, rockchip, vc4. - More drm -> linux irq conversions. - Add support for some Logic Technologies and Multi-Inno panels. - Expose phy-functionality for drm/rockchip, to allow controlling from the media subsystem. - Add support for 2 AUO panels. - Add damage handling to ssd1307fb. - Improve FIFO handling on mxsfb. - Assorted small fixes to vmwgfx, and bump version to 2.19 for the new ioctls. - Improve sony acx424akp backlight handling. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 988dbd2 + c7d3062 commit cfeeb0b

File tree

84 files changed

+1797
-680
lines changed

Some content is hidden

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

84 files changed

+1797
-680
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ properties:
4646
# AU Optronics Corporation 11.6" HD (1366x768) color TFT-LCD panel
4747
- auo,b116xw03
4848
# AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel
49+
- auo,b133han05
50+
# AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel
4951
- auo,b133htn01
5052
# AU Optronics Corporation 13.3" WXGA (1366x768) TFT LCD panel
5153
- auo,b133xtn01
54+
# AU Optronics Corporation 14.0" FHD (1920x1080) color TFT-LCD panel
55+
- auo,b140han06
5256
# AU Optronics Corporation 7.0" FHD (800 x 480) TFT LCD panel
5357
- auo,g070vvn01
5458
# AU Optronics Corporation 10.1" (1280x800) color TFT LCD panel
@@ -208,8 +212,14 @@ properties:
208212
- logictechno,lt161010-2nhr
209213
# Logic Technologies LT170410-2WHC 10.1" 1280x800 IPS TFT Cap Touch Mod.
210214
- logictechno,lt170410-2whc
215+
# Logic Technologies LTTD800x480 L2RT 7" 800x480 TFT Resistive Touch Module
216+
- logictechno,lttd800480070-l2rt
217+
# Logic Technologies LTTD800480070-L6WH-RT 7” 800x480 TFT Resistive Touch Module
218+
- logictechno,lttd800480070-l6wh-rt
211219
# Mitsubishi "AA070MC01 7.0" WVGA TFT LCD panel
212220
- mitsubishi,aa070mc01-ca1
221+
# Multi-Inno Technology Co.,Ltd MI1010AIT-1CP 10.1" 1280x800 LVDS IPS Cap Touch Mod.
222+
- multi-inno,mi1010ait-1cp
213223
# NEC LCD Technologies, Ltd. 12.1" WXGA (1280x800) LVDS TFT LCD panel
214224
- nec,nl12880bc20-05
215225
# NEC LCD Technologies,Ltd. WQVGA TFT LCD panel

Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Required properties:
2323
Optional properties:
2424
- phys: from general PHY binding: the phandle for the PHY device.
2525
- phy-names: Should be "dphy" if phys references an external phy.
26+
- #phy-cells: Defined when used as ISP phy, should be 0.
2627
- power-domains: a phandle to mipi dsi power domain node.
2728
- resets: list of phandle + reset specifier pairs, as described in [3].
2829
- reset-names: string reset name, must be "apb".
Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/solomon,ssd1307fb.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Solomon SSD1307 OLED Controller Framebuffer
8+
9+
maintainers:
10+
- Maxime Ripard <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- solomon,ssd1305fb-i2c
16+
- solomon,ssd1306fb-i2c
17+
- solomon,ssd1307fb-i2c
18+
- solomon,ssd1309fb-i2c
19+
20+
reg:
21+
maxItems: 1
22+
23+
pwms:
24+
maxItems: 1
25+
26+
reset-gpios:
27+
maxItems: 1
28+
29+
vbat-supply:
30+
description: The supply for VBAT
31+
32+
solomon,height:
33+
$ref: /schemas/types.yaml#/definitions/uint32
34+
default: 16
35+
description:
36+
Height in pixel of the screen driven by the controller
37+
38+
solomon,width:
39+
$ref: /schemas/types.yaml#/definitions/uint32
40+
default: 96
41+
description:
42+
Width in pixel of the screen driven by the controller
43+
44+
solomon,page-offset:
45+
$ref: /schemas/types.yaml#/definitions/uint32
46+
default: 1
47+
description:
48+
Offset of pages (band of 8 pixels) that the screen is mapped to
49+
50+
solomon,segment-no-remap:
51+
type: boolean
52+
description:
53+
Display needs normal (non-inverted) data column to segment mapping
54+
55+
solomon,col-offset:
56+
$ref: /schemas/types.yaml#/definitions/uint32
57+
default: 0
58+
description:
59+
Offset of columns (COL/SEG) that the screen is mapped to
60+
61+
solomon,com-seq:
62+
type: boolean
63+
description:
64+
Display uses sequential COM pin configuration
65+
66+
solomon,com-lrremap:
67+
type: boolean
68+
description:
69+
Display uses left-right COM pin remap
70+
71+
solomon,com-invdir:
72+
type: boolean
73+
description:
74+
Display uses inverted COM pin scan direction
75+
76+
solomon,com-offset:
77+
$ref: /schemas/types.yaml#/definitions/uint32
78+
default: 0
79+
description:
80+
Number of the COM pin wired to the first display line
81+
82+
solomon,prechargep1:
83+
$ref: /schemas/types.yaml#/definitions/uint32
84+
default: 2
85+
description:
86+
Length of deselect period (phase 1) in clock cycles
87+
88+
solomon,prechargep2:
89+
$ref: /schemas/types.yaml#/definitions/uint32
90+
default: 2
91+
description:
92+
Length of precharge period (phase 2) in clock cycles. This needs to be
93+
the higher, the higher the capacitance of the OLED's pixels is.
94+
95+
solomon,dclk-div:
96+
$ref: /schemas/types.yaml#/definitions/uint32
97+
minimum: 1
98+
maximum: 16
99+
description:
100+
Clock divisor. The default value is controller-dependent.
101+
102+
solomon,dclk-frq:
103+
$ref: /schemas/types.yaml#/definitions/uint32
104+
minimum: 0
105+
maximum: 15
106+
description:
107+
Clock frequency, higher value means higher frequency.
108+
The default value is controller-dependent.
109+
110+
solomon,lookup-table:
111+
$ref: /schemas/types.yaml#/definitions/uint8-array
112+
maxItems: 4
113+
description:
114+
8 bit value array of current drive pulse widths for BANK0, and colors A,
115+
B, and C. Each value in range of 31 to 63 for pulse widths of 32 to 64.
116+
Color D is always width 64.
117+
118+
solomon,area-color-enable:
119+
type: boolean
120+
description:
121+
Display uses color mode
122+
123+
solomon,low-power:
124+
type: boolean
125+
description:
126+
Display runs in low power mode
127+
128+
required:
129+
- compatible
130+
- reg
131+
132+
allOf:
133+
- if:
134+
properties:
135+
compatible:
136+
contains:
137+
const: solomon,ssd1305fb-i2c
138+
then:
139+
properties:
140+
solomon,dclk-div:
141+
default: 1
142+
solomon,dclk-frq:
143+
default: 7
144+
145+
- if:
146+
properties:
147+
compatible:
148+
contains:
149+
const: solomon,ssd1306fb-i2c
150+
then:
151+
properties:
152+
solomon,dclk-div:
153+
default: 1
154+
solomon,dclk-frq:
155+
default: 8
156+
157+
- if:
158+
properties:
159+
compatible:
160+
contains:
161+
const: solomon,ssd1307fb-i2c
162+
then:
163+
properties:
164+
solomon,dclk-div:
165+
default: 2
166+
solomon,dclk-frq:
167+
default: 12
168+
required:
169+
- pwms
170+
171+
- if:
172+
properties:
173+
compatible:
174+
contains:
175+
const: solomon,ssd1309fb-i2c
176+
then:
177+
properties:
178+
solomon,dclk-div:
179+
default: 1
180+
solomon,dclk-frq:
181+
default: 10
182+
183+
additionalProperties: false
184+
185+
examples:
186+
- |
187+
i2c1 {
188+
#address-cells = <1>;
189+
#size-cells = <0>;
190+
191+
ssd1307: oled@3c {
192+
compatible = "solomon,ssd1307fb-i2c";
193+
reg = <0x3c>;
194+
pwms = <&pwm 4 3000>;
195+
reset-gpios = <&gpio2 7>;
196+
};
197+
198+
ssd1306: oled@3d {
199+
compatible = "solomon,ssd1306fb-i2c";
200+
reg = <0x3c>;
201+
pwms = <&pwm 4 3000>;
202+
reset-gpios = <&gpio2 7>;
203+
solomon,com-lrremap;
204+
solomon,com-invdir;
205+
solomon,com-offset = <32>;
206+
solomon,lookup-table = /bits/ 8 <0x3f 0x3f 0x3f 0x3f>;
207+
};
208+
};

Documentation/devicetree/bindings/display/ssd1307fb.txt

Lines changed: 0 additions & 60 deletions
This file was deleted.

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,8 @@ patternProperties:
936936
description: Chengdu Kaixuan Information Technology Co., Ltd.
937937
"^qiaodian,.*":
938938
description: QiaoDian XianShi Corporation
939+
"^qishenglong,.*":
940+
description: Shenzhen QiShenglong Industrialist Co., Ltd.
939941
"^qnap,.*":
940942
description: QNAP Systems, Inc.
941943
"^radxa,.*":

Documentation/driver-api/thermal/nouveau_thermal.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Bug reports
9090
-----------
9191

9292
Thermal management on Nouveau is new and may not work on all cards. If you have
93-
inquiries, please ping mupuf on IRC (#nouveau, freenode).
93+
inquiries, please ping mupuf on IRC (#nouveau, OFTC).
9494

9595
Bug reports should be filled on Freedesktop's bug tracker. Please follow
9696
https://nouveau.freedesktop.org/wiki/Bugs

Documentation/gpu/drm-kms.rst

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,35 @@ KMS Properties
463463
This section of the documentation is primarily aimed at user-space developers.
464464
For the driver APIs, see the other sections.
465465

466+
Requirements
467+
------------
468+
469+
KMS drivers might need to add extra properties to support new features. Each
470+
new property introduced in a driver needs to meet a few requirements, in
471+
addition to the one mentioned above:
472+
473+
* It must be standardized, documenting:
474+
475+
* The full, exact, name string;
476+
* If the property is an enum, all the valid value name strings;
477+
* What values are accepted, and what these values mean;
478+
* What the property does and how it can be used;
479+
* How the property might interact with other, existing properties.
480+
481+
* It must provide a generic helper in the core code to register that
482+
property on the object it attaches to.
483+
484+
* Its content must be decoded by the core and provided in the object's
485+
associated state structure. That includes anything drivers might want
486+
to precompute, like struct drm_clip_rect for planes.
487+
488+
* Its initial state must match the behavior prior to the property
489+
introduction. This might be a fixed value matching what the hardware
490+
does, or it may be inherited from the state the firmware left the
491+
system in during boot.
492+
493+
* An IGT test must be submitted where reasonable.
494+
466495
Property Types and Blob Property Support
467496
----------------------------------------
468497

@@ -508,8 +537,8 @@ Plane Composition Properties
508537
Damage Tracking Properties
509538
--------------------------
510539

511-
.. kernel-doc:: drivers/gpu/drm/drm_damage_helper.c
512-
:doc: overview
540+
.. kernel-doc:: drivers/gpu/drm/drm_plane.c
541+
:doc: damage tracking
513542

514543
Color Management Properties
515544
---------------------------

Documentation/gpu/drm-uapi.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@ Primary Nodes, DRM Master and Authentication
3737
.. kernel-doc:: include/drm/drm_auth.h
3838
:internal:
3939

40+
41+
.. _drm_leasing:
42+
43+
DRM Display Resource Leasing
44+
============================
45+
46+
.. kernel-doc:: drivers/gpu/drm/drm_lease.c
47+
:doc: drm leasing
48+
4049
Open-Source Userspace Requirements
4150
==================================
4251

0 commit comments

Comments
 (0)