Skip to content

Commit 6c7f274

Browse files
danvetdanvet
committed
Merge tag 'drm-misc-next-2023-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.6: UAPI Changes: * fbdev: * Make fbdev userspace interfaces optional; only leaves the framebuffer console active * prime: * Support dma-buf self-import for all drivers automatically: improves support for many userspace compositors Cross-subsystem Changes: * backlight: * Fix interaction with fbdev in several drivers * base: Convert struct platform.remove to return void; part of a larger, tree-wide effort * dma-buf: Acquire reservation lock for mmap() in exporters; part of an on-going effort to simplify locking around dma-bufs * fbdev: * Use Linux device instead of fbdev device in many places * Use deferred-I/O helper macros in various drivers * i2c: Convert struct i2c from .probe_new to .probe; part of a larger, tree-wide effort * video: * Avoid including <linux/screen_info.h> Core Changes: * atomic: * Improve logging * prime: * Remove struct drm_driver.gem_prime_mmap plus driver updates: all drivers now implement this callback with drm_gem_prime_mmap() * gem: * Support execution contexts: provides locking over multiple GEM objects * ttm: * Support init_on_free * Swapout fixes Driver Changes: * accel: * ivpu: MMU updates; Support debugfs * ast: * Improve device-model detection * Cleanups * bridge: * dw-hdmi: Improve support for YUV420 bus format * dw-mipi-dsi: Fix enable/disable of DSI controller * lt9611uxc: Use MODULE_FIRMWARE() * ps8640: Remove broken EDID code * samsung-dsim: Fix command transfer * tc358764: Handle HS/VS polarity; Use BIT() macro; Various cleanups * Cleanups * ingenic: * Kconfig REGMAP fixes * loongson: * Support display controller * mgag200: * Minor fixes * mxsfb: * Support disabling overlay planes * nouveau: * Improve VRAM detection * Various fixes and cleanups * panel: * panel-edp: Support AUO B116XAB01.4 * Support Visionox R66451 plus DT bindings * Cleanups * ssd130x: * Support per-controller default resolution plus DT bindings * Reduce memory-allocation overhead * Cleanups * tidss: * Support TI AM625 plus DT bindings * Implement new connector model plus driver updates * vkms * Improve write-back support * Documentation fixes Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20230713090830.GA23281@linux-uq9g
2 parents fdf0eaf + 36672dd commit 6c7f274

370 files changed

Lines changed: 11462 additions & 3303 deletions

File tree

Some content is hidden

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

‎Documentation/devicetree/bindings/display/panel/visionox,r66451.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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/visionox,r66451.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Visionox R66451 AMOLED DSI Panel
8+
9+
maintainers:
10+
- Jessica Zhang <quic_jesszhan@quicinc.com>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: visionox,r66451
18+
19+
reg:
20+
maxItems: 1
21+
description: DSI virtual channel
22+
23+
vddio-supply: true
24+
vdd-supply: true
25+
port: true
26+
reset-gpios: true
27+
28+
additionalProperties: false
29+
30+
required:
31+
- compatible
32+
- reg
33+
- vddio-supply
34+
- vdd-supply
35+
- reset-gpios
36+
- port
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/gpio/gpio.h>
41+
dsi {
42+
#address-cells = <1>;
43+
#size-cells = <0>;
44+
panel@0 {
45+
compatible = "visionox,r66451";
46+
reg = <0>;
47+
vddio-supply = <&vreg_l12c_1p8>;
48+
vdd-supply = <&vreg_l13c_3p0>;
49+
50+
reset-gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
51+
52+
port {
53+
panel0_in: endpoint {
54+
remote-endpoint = <&dsi0_out>;
55+
};
56+
};
57+
};
58+
};
59+
...

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ properties:
4949

5050
solomon,height:
5151
$ref: /schemas/types.yaml#/definitions/uint32
52-
default: 16
5352
description:
54-
Height in pixel of the screen driven by the controller
53+
Height in pixel of the screen driven by the controller.
54+
The default value is controller-dependent.
5555

5656
solomon,width:
5757
$ref: /schemas/types.yaml#/definitions/uint32
58-
default: 96
5958
description:
60-
Width in pixel of the screen driven by the controller
59+
Width in pixel of the screen driven by the controller.
60+
The default value is controller-dependent.
6161

6262
solomon,page-offset:
6363
$ref: /schemas/types.yaml#/definitions/uint32
@@ -157,6 +157,10 @@ allOf:
157157
const: sinowealth,sh1106
158158
then:
159159
properties:
160+
width:
161+
default: 132
162+
height:
163+
default: 64
160164
solomon,dclk-div:
161165
default: 1
162166
solomon,dclk-frq:
@@ -171,6 +175,10 @@ allOf:
171175
- solomon,ssd1305
172176
then:
173177
properties:
178+
width:
179+
default: 132
180+
height:
181+
default: 64
174182
solomon,dclk-div:
175183
default: 1
176184
solomon,dclk-frq:
@@ -185,6 +193,10 @@ allOf:
185193
- solomon,ssd1306
186194
then:
187195
properties:
196+
width:
197+
default: 128
198+
height:
199+
default: 64
188200
solomon,dclk-div:
189201
default: 1
190202
solomon,dclk-frq:
@@ -199,6 +211,10 @@ allOf:
199211
- solomon,ssd1307
200212
then:
201213
properties:
214+
width:
215+
default: 128
216+
height:
217+
default: 39
202218
solomon,dclk-div:
203219
default: 2
204220
solomon,dclk-frq:
@@ -215,6 +231,10 @@ allOf:
215231
- solomon,ssd1309
216232
then:
217233
properties:
234+
width:
235+
default: 128
236+
height:
237+
default: 64
218238
solomon,dclk-div:
219239
default: 1
220240
solomon,dclk-frq:

‎Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ maintainers:
1212
- Tomi Valkeinen <tomi.valkeinen@ti.com>
1313

1414
description: |
15-
The AM65x TI Keystone Display SubSystem with two output ports and
16-
two video planes. The first video port supports OLDI and the second
17-
supports DPI format. The fist plane is full video plane with all
18-
features and the second is a "lite plane" without scaling support.
15+
The AM625 and AM65x TI Keystone Display SubSystem with two output
16+
ports and two video planes. In AM65x DSS, the first video port
17+
supports 1 OLDI TX and in AM625 DSS, the first video port output is
18+
internally routed to 2 OLDI TXes. The second video port supports DPI
19+
format. The first plane is full video plane with all features and the
20+
second is a "lite plane" without scaling support.
1921
2022
properties:
2123
compatible:
22-
const: ti,am65x-dss
24+
enum:
25+
- ti,am625-dss
26+
- ti,am65x-dss
2327

2428
reg:
2529
description:
@@ -80,7 +84,9 @@ properties:
8084
port@0:
8185
$ref: /schemas/graph.yaml#/properties/port
8286
description:
83-
The DSS OLDI output port node form video port 1
87+
For AM65x DSS, the OLDI output port node from video port 1.
88+
For AM625 DSS, the internal DPI output port node from video
89+
port 1.
8490

8591
port@1:
8692
$ref: /schemas/graph.yaml#/properties/port

‎Documentation/gpu/drm-mm.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,18 @@ DRM Sync Objects
493493
.. kernel-doc:: drivers/gpu/drm/drm_syncobj.c
494494
:export:
495495

496+
DRM Execution context
497+
=====================
498+
499+
.. kernel-doc:: drivers/gpu/drm/drm_exec.c
500+
:doc: Overview
501+
502+
.. kernel-doc:: include/drm/drm_exec.h
503+
:internal:
504+
505+
.. kernel-doc:: drivers/gpu/drm/drm_exec.c
506+
:export:
507+
496508
GPU Scheduler
497509
=============
498510

‎Documentation/gpu/todo.rst‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -319,15 +319,6 @@ Contact: Daniel Vetter, Noralf Tronnes
319319

320320
Level: Advanced
321321

322-
struct drm_gem_object_funcs
323-
---------------------------
324-
325-
GEM objects can now have a function table instead of having the callbacks on the
326-
DRM driver struct. This is now the preferred way. Callbacks in drivers have been
327-
converted, except for struct drm_driver.gem_prime_mmap.
328-
329-
Level: Intermediate
330-
331322
connector register/unregister fixes
332323
-----------------------------------
333324

@@ -452,6 +443,19 @@ Contact: Thomas Zimmermann <tzimmermann@suse.de>
452443

453444
Level: Starter
454445

446+
Remove driver dependencies on FB_DEVICE
447+
---------------------------------------
448+
449+
A number of fbdev drivers provide attributes via sysfs and therefore depend
450+
on CONFIG_FB_DEVICE to be selected. Review each driver and attempt to make
451+
any dependencies on CONFIG_FB_DEVICE optional. At the minimum, the respective
452+
code in the driver could be conditionalized via ifdef CONFIG_FB_DEVICE. Not
453+
all drivers might be able to drop CONFIG_FB_DEVICE.
454+
455+
Contact: Thomas Zimmermann <tzimmermann@suse.de>
456+
457+
Level: Starter
458+
455459

456460
Core refactorings
457461
=================

‎MAINTAINERS‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6150,10 +6150,9 @@ F: kernel/dma/
61506150
DMA-BUF HEAPS FRAMEWORK
61516151
M: Sumit Semwal <sumit.semwal@linaro.org>
61526152
R: Benjamin Gaignard <benjamin.gaignard@collabora.com>
6153-
R: Liam Mark <lmark@codeaurora.org>
6154-
R: Laura Abbott <labbott@redhat.com>
61556153
R: Brian Starkey <Brian.Starkey@arm.com>
61566154
R: John Stultz <jstultz@google.com>
6155+
R: T.J. Mercier <tjmercier@google.com>
61576156
L: linux-media@vger.kernel.org
61586157
L: dri-devel@lists.freedesktop.org
61596158
L: linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
@@ -6395,6 +6394,7 @@ F: drivers/gpu/drm/aspeed/
63956394
DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
63966395
M: Dave Airlie <airlied@redhat.com>
63976396
R: Thomas Zimmermann <tzimmermann@suse.de>
6397+
R: Jocelyn Falempe <jfalempe@redhat.com>
63986398
L: dri-devel@lists.freedesktop.org
63996399
S: Supported
64006400
T: git git://anongit.freedesktop.org/drm/drm-misc
@@ -6546,6 +6546,7 @@ F: drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
65466546
DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
65476547
M: Dave Airlie <airlied@redhat.com>
65486548
R: Thomas Zimmermann <tzimmermann@suse.de>
6549+
R: Jocelyn Falempe <jfalempe@redhat.com>
65496550
L: dri-devel@lists.freedesktop.org
65506551
S: Supported
65516552
T: git git://anongit.freedesktop.org/drm/drm-misc
@@ -6945,6 +6946,13 @@ T: git git://anongit.freedesktop.org/drm/drm-misc
69456946
F: drivers/gpu/drm/lima/
69466947
F: include/uapi/drm/lima_drm.h
69476948

6949+
DRM DRIVERS FOR LOONGSON
6950+
M: Sui Jingfeng <suijingfeng@loongson.cn>
6951+
L: dri-devel@lists.freedesktop.org
6952+
S: Supported
6953+
T: git git://anongit.freedesktop.org/drm/drm-misc
6954+
F: drivers/gpu/drm/loongson/
6955+
69486956
DRM DRIVERS FOR MEDIATEK
69496957
M: Chun-Kuang Hu <chunkuang.hu@kernel.org>
69506958
M: Philipp Zabel <p.zabel@pengutronix.de>
@@ -7014,7 +7022,7 @@ F: drivers/gpu/drm/stm
70147022

70157023
DRM DRIVERS FOR TI KEYSTONE
70167024
M: Jyri Sarha <jyri.sarha@iki.fi>
7017-
M: Tomi Valkeinen <tomba@kernel.org>
7025+
M: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
70187026
L: dri-devel@lists.freedesktop.org
70197027
S: Maintained
70207028
T: git git://anongit.freedesktop.org/drm/drm-misc
@@ -7025,16 +7033,18 @@ F: drivers/gpu/drm/tidss/
70257033

70267034
DRM DRIVERS FOR TI LCDC
70277035
M: Jyri Sarha <jyri.sarha@iki.fi>
7028-
R: Tomi Valkeinen <tomba@kernel.org>
7036+
M: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
70297037
L: dri-devel@lists.freedesktop.org
70307038
S: Maintained
7039+
T: git git://anongit.freedesktop.org/drm/drm-misc
70317040
F: Documentation/devicetree/bindings/display/tilcdc/
70327041
F: drivers/gpu/drm/tilcdc/
70337042

70347043
DRM DRIVERS FOR TI OMAP
7035-
M: Tomi Valkeinen <tomba@kernel.org>
7044+
M: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
70367045
L: dri-devel@lists.freedesktop.org
70377046
S: Maintained
7047+
T: git git://anongit.freedesktop.org/drm/drm-misc
70387048
F: Documentation/devicetree/bindings/display/ti/
70397049
F: drivers/gpu/drm/omapdrm/
70407050

‎arch/arm/kernel/efi.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <linux/efi.h>
77
#include <linux/memblock.h>
8+
#include <linux/screen_info.h>
9+
810
#include <asm/efi.h>
911
#include <asm/mach/map.h>
1012
#include <asm/mmu_context.h>

‎arch/arm64/kernel/efi.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <linux/efi.h>
1111
#include <linux/init.h>
12+
#include <linux/screen_info.h>
1213

1314
#include <asm/efi.h>
1415
#include <asm/stacktrace.h>

‎arch/loongarch/kernel/efi.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/kobject.h>
1919
#include <linux/memblock.h>
2020
#include <linux/reboot.h>
21+
#include <linux/screen_info.h>
2122
#include <linux/uaccess.h>
2223

2324
#include <asm/early_ioremap.h>

‎arch/sh/boards/mach-ecovec24/setup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ static struct property_entry gpio_backlight_props[] = {
386386
};
387387

388388
static struct gpio_backlight_platform_data gpio_backlight_data = {
389-
.fbdev = &lcdc_device.dev,
389+
.dev = &lcdc_device.dev,
390390
};
391391

392392
static const struct platform_device_info gpio_backlight_device_info = {

0 commit comments

Comments
 (0)