Skip to content

Commit 2871ec4

Browse files
committed
Merge tag 'drm-misc-next-2024-04-19' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.10-rc1: UAPI Changes: - Add SIZE_HINTS property for cursor planes. Cross-subsystem Changes: Core Changes: - Document the requirements and expectations of adding new driver-specific properties. - Assorted small fixes to ttm. - More Kconfig fixes. - Add struct drm_edid_product_id and helpers. - Use drm device based logging in more drm functions. - Fixes for drm-panic, and option to test it. - Assorted small fixes and updates to edid. - Add drm_crtc_vblank_crtc and use it in vkms, nouveau. Driver Changes: - Assorted small fixes and improvements to bridge/imx8mp-hdmi-tx, nouveau, ast, qaic, lima, vc4, bridge/anx7625, mipi-dsi. - Add drm panic to simpledrm, mgag200, imx, ast. - Use dev_err_probe in bridge/panel drivers. - Add Innolux G121X1-L03, LG sw43408 panels. - Use struct drm_edid in i915 bios parsing. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 377b5b3 + 069a6c0 commit 2871ec4

File tree

96 files changed

+3477
-515
lines changed

Some content is hidden

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

96 files changed

+3477
-515
lines changed
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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/lg,sw43408.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: LG SW43408 1080x2160 DSI panel
8+
9+
maintainers:
10+
- Caleb Connolly <[email protected]>
11+
12+
description:
13+
This panel is used on the Pixel 3, it is a 60hz OLED panel which
14+
required DSC (Display Stream Compression) and has rounded corners.
15+
16+
allOf:
17+
- $ref: panel-common.yaml#
18+
19+
properties:
20+
compatible:
21+
items:
22+
- const: lg,sw43408
23+
24+
reg: true
25+
port: true
26+
vddi-supply: true
27+
vpnl-supply: true
28+
reset-gpios: true
29+
30+
required:
31+
- compatible
32+
- vddi-supply
33+
- vpnl-supply
34+
- reset-gpios
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/gpio/gpio.h>
41+
42+
dsi {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
46+
panel@0 {
47+
compatible = "lg,sw43408";
48+
reg = <0>;
49+
50+
vddi-supply = <&vreg_l14a_1p88>;
51+
vpnl-supply = <&vreg_l28a_3p0>;
52+
53+
reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
54+
55+
port {
56+
endpoint {
57+
remote-endpoint = <&mdss_dsi0_out>;
58+
};
59+
};
60+
};
61+
};
62+
...

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ properties:
190190
- innolux,g121i1-l01
191191
# Innolux Corporation 12.1" G121X1-L03 XGA (1024x768) TFT LCD panel
192192
- innolux,g121x1-l03
193+
# Innolux Corporation 12.1" G121XCE-L01 XGA (1024x768) TFT LCD panel
194+
- innolux,g121xce-l01
193195
# Innolux Corporation 11.6" WXGA (1366x768) TFT LCD panel
194196
- innolux,n116bca-ea1
195197
# Innolux Corporation 11.6" WXGA (1366x768) TFT LCD panel

Documentation/driver-api/dma-buf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ consider though:
7777
the usual size discover pattern size = SEEK_END(0); SEEK_SET(0). Every other
7878
llseek operation will report -EINVAL.
7979

80-
If llseek on dma-buf FDs isn't support the kernel will report -ESPIPE for all
80+
If llseek on dma-buf FDs isn't supported the kernel will report -ESPIPE for all
8181
cases. Userspace can use this to detect support for discovering the dma-buf
8282
size using llseek.
8383

Documentation/gpu/drm-kms.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,21 @@ Plane Damage Tracking Functions Reference
398398
.. kernel-doc:: include/drm/drm_damage_helper.h
399399
:internal:
400400

401+
Plane Panic Feature
402+
-------------------
403+
404+
.. kernel-doc:: drivers/gpu/drm/drm_panic.c
405+
:doc: overview
406+
407+
Plane Panic Functions Reference
408+
-------------------------------
409+
410+
.. kernel-doc:: include/drm/drm_panic.h
411+
:internal:
412+
413+
.. kernel-doc:: drivers/gpu/drm/drm_panic.c
414+
:export:
415+
401416
Display Modes Function Reference
402417
================================
403418

@@ -496,6 +511,13 @@ addition to the one mentioned above:
496511

497512
* An IGT test must be submitted where reasonable.
498513

514+
For historical reasons, non-standard, driver-specific properties exist. If a KMS
515+
driver wants to add support for one of those properties, the requirements for
516+
new properties apply where possible. Additionally, the documented behavior must
517+
match the de facto semantics of the existing property to ensure compatibility.
518+
Developers of the driver that first added the property should help with those
519+
tasks and must ACK the documented behavior if possible.
520+
499521
Property Types and Blob Property Support
500522
----------------------------------------
501523

MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6764,6 +6764,14 @@ S: Maintained
67646764
F: Documentation/devicetree/bindings/display/panel/jadard,jd9365da-h3.yaml
67656765
F: drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c
67666766

6767+
DRM DRIVER FOR LG SW43408 PANELS
6768+
M: Sumit Semwal <[email protected]>
6769+
M: Caleb Connolly <[email protected]>
6770+
S: Maintained
6771+
T: git git://anongit.freedesktop.org/drm/drm-misc
6772+
F: Documentation/devicetree/bindings/display/panel/lg,sw43408.yaml
6773+
F: drivers/gpu/drm/panel/panel-lg-sw43408.c
6774+
67676775
DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER
67686776
M: Paul Kocialkowski <[email protected]>
67696777
S: Supported

drivers/accel/qaic/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ qaic-y := \
1010
qaic_control.o \
1111
qaic_data.o \
1212
qaic_drv.o \
13-
qaic_timesync.o
13+
qaic_timesync.o \
14+
sahara.o
1415

1516
qaic-$(CONFIG_DEBUG_FS) += qaic_debugfs.o

drivers/accel/qaic/qaic_debugfs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ int qaic_bootlog_register(void);
1313
void qaic_bootlog_unregister(void);
1414
void qaic_debugfs_init(struct qaic_drm_device *qddev);
1515
#else
16-
int qaic_bootlog_register(void) { return 0; }
17-
void qaic_bootlog_unregister(void) {}
18-
void qaic_debugfs_init(struct qaic_drm_device *qddev) {}
16+
static inline int qaic_bootlog_register(void) { return 0; }
17+
static inline void qaic_bootlog_unregister(void) {}
18+
static inline void qaic_debugfs_init(struct qaic_drm_device *qddev) {}
1919
#endif /* CONFIG_DEBUG_FS */
2020
#endif /* __QAIC_DEBUGFS_H__ */

drivers/accel/qaic/qaic_drv.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "qaic.h"
3131
#include "qaic_debugfs.h"
3232
#include "qaic_timesync.h"
33+
#include "sahara.h"
3334

3435
MODULE_IMPORT_NS(DMA_BUF);
3536

@@ -644,6 +645,12 @@ static int __init qaic_init(void)
644645
goto free_pci;
645646
}
646647

648+
ret = sahara_register();
649+
if (ret) {
650+
pr_debug("qaic: sahara_register failed %d\n", ret);
651+
goto free_mhi;
652+
}
653+
647654
ret = qaic_timesync_init();
648655
if (ret)
649656
pr_debug("qaic: qaic_timesync_init failed %d\n", ret);
@@ -654,6 +661,8 @@ static int __init qaic_init(void)
654661

655662
return 0;
656663

664+
free_mhi:
665+
mhi_driver_unregister(&qaic_mhi_driver);
657666
free_pci:
658667
pci_unregister_driver(&qaic_pci_driver);
659668
return ret;
@@ -679,6 +688,7 @@ static void __exit qaic_exit(void)
679688
link_up = true;
680689
qaic_bootlog_unregister();
681690
qaic_timesync_deinit();
691+
sahara_unregister();
682692
mhi_driver_unregister(&qaic_mhi_driver);
683693
pci_unregister_driver(&qaic_pci_driver);
684694
}

0 commit comments

Comments
 (0)