Skip to content

Commit f8e4806

Browse files
committed
Merge tag 'drm-misc-next-2024-01-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.9: UAPI Changes: virtio: - add Venus capset defines Cross-subsystem Changes: Core Changes: - fix drm_fixp2int_ceil() - documentation fixes - clean ups - allow DRM_MM_DEBUG with DRM=m - build fixes for debugfs support - EDID cleanups - sched: error-handling fixes - ttm: add tests Driver Changes: bridge: - ite-6505: fix DP link-training bug - samsung-dsim: fix error checking in probe - tc358767: fix regmap usage efifb: - use copy of global screen_info state hisilicon: - fix EDID includes mgag200: - improve ioremap usage - convert to struct drm_edid nouveau: - disp: use kmemdup() - fix EDID includes - documentation fixes panel: - ltk050h3146w: error-handling fixes - panel-edp: support delay between power-on and enable; use put_sync in unprepare; support Mediatek MT8173 Chromebooks, BOE NV116WHM-N49 V8.0, BOE NV122WUM-N41, CSO MNC207QS1-1 plus DT bindings - panel-lvds: support EDT ETML0700Z9NDHA plus DT bindings - panel-novatek: FRIDA FRD400B25025-A-CTK plus DT bindings qaic: - fixes to BO handling - make use of DRM managed release - fix order of remove operations rockchip: - analogix_dp: get encoder port from DT - inno_hdmi: support HDMI for RK3128 - lvds: error-handling fixes simplefb: - fix logging ssd130x: - support SSD133x plus DT bindings tegra: - fix error handling tilcdc: - make use of DRM managed release v3d: - show memory stats in debugfs vc4: - fix error handling in plane prepare_fb - fix framebuffer test in plane helpers vesafb: - use copy of global screen_info state virtio: - cleanups vkms: - fix OOB access when programming the LUT - Kconfig improvements vmwgfx: - unmap surface before changing plane state - fix memory leak in error handling - documentation fixes Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20240111154902.GA8448@linux-uq9g
2 parents 54be6c6 + 502756e commit f8e4806

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

+3397
-1097
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ allOf:
1515
properties:
1616
compatible:
1717
items:
18-
- const: hydis,hva40wv1
18+
- enum:
19+
- frida,frd400b25025
20+
- hydis,hva40wv1
1921
- const: novatek,nt35510
2022
description: This indicates the panel manufacturer of the panel
2123
that is in turn using the NT35510 panel driver. The compatible

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ properties:
4242
- auo,b101ew05
4343
# Chunghwa Picture Tubes Ltd. 7" WXGA (800x1280) TFT LCD LVDS panel
4444
- chunghwa,claa070wp03xg
45+
# EDT ETML0700Z9NDHA 7.0" WSVGA (1024x600) color TFT LCD LVDS panel
46+
- edt,etml0700z9ndha
4547
# HannStar Display Corp. HSD101PWW2 10.1" WXGA (1280x800) LVDS panel
4648
- hannstar,hsd101pww2
4749
# Hydis Technologies 7" WXGA (800x1280) TFT LCD LVDS panel

Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ allOf:
131131
const: sinowealth,sh1106
132132
then:
133133
properties:
134-
width:
134+
solomon,width:
135135
default: 132
136-
height:
136+
solomon,height:
137137
default: 64
138138
solomon,dclk-div:
139139
default: 1
@@ -149,9 +149,9 @@ allOf:
149149
- solomon,ssd1305
150150
then:
151151
properties:
152-
width:
152+
solomon,width:
153153
default: 132
154-
height:
154+
solomon,height:
155155
default: 64
156156
solomon,dclk-div:
157157
default: 1
@@ -167,9 +167,9 @@ allOf:
167167
- solomon,ssd1306
168168
then:
169169
properties:
170-
width:
170+
solomon,width:
171171
default: 128
172-
height:
172+
solomon,height:
173173
default: 64
174174
solomon,dclk-div:
175175
default: 1
@@ -185,9 +185,9 @@ allOf:
185185
- solomon,ssd1307
186186
then:
187187
properties:
188-
width:
188+
solomon,width:
189189
default: 128
190-
height:
190+
solomon,height:
191191
default: 39
192192
solomon,dclk-div:
193193
default: 2
@@ -205,9 +205,9 @@ allOf:
205205
- solomon,ssd1309
206206
then:
207207
properties:
208-
width:
208+
solomon,width:
209209
default: 128
210-
height:
210+
solomon,height:
211211
default: 64
212212
solomon,dclk-div:
213213
default: 1

Documentation/devicetree/bindings/display/solomon,ssd132x.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ allOf:
3030
const: solomon,ssd1322
3131
then:
3232
properties:
33-
width:
33+
solomon,width:
3434
default: 480
35-
height:
35+
solomon,height:
3636
default: 128
3737

3838
- if:
@@ -42,9 +42,9 @@ allOf:
4242
const: solomon,ssd1325
4343
then:
4444
properties:
45-
width:
45+
solomon,width:
4646
default: 128
47-
height:
47+
solomon,height:
4848
default: 80
4949

5050
- if:
@@ -54,9 +54,9 @@ allOf:
5454
const: solomon,ssd1327
5555
then:
5656
properties:
57-
width:
57+
solomon,width:
5858
default: 128
59-
height:
59+
solomon,height:
6060
default: 128
6161

6262
unevaluatedProperties: false
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
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,ssd133x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Solomon SSD133x OLED Display Controllers
8+
9+
maintainers:
10+
- Javier Martinez Canillas <javierm@redhat.com>
11+
12+
allOf:
13+
- $ref: solomon,ssd-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- solomon,ssd1331
19+
20+
solomon,width:
21+
default: 96
22+
23+
solomon,height:
24+
default: 64
25+
26+
required:
27+
- compatible
28+
- reg
29+
30+
unevaluatedProperties: false
31+
32+
examples:
33+
- |
34+
spi {
35+
#address-cells = <1>;
36+
#size-cells = <0>;
37+
38+
oled@0 {
39+
compatible = "solomon,ssd1331";
40+
reg = <0x0>;
41+
reset-gpios = <&gpio2 7>;
42+
dc-gpios = <&gpio2 8>;
43+
spi-max-frequency = <10000000>;
44+
};
45+
};

Documentation/gpu/rfc/xe.rst

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

0 commit comments

Comments
 (0)