Skip to content

Commit 91dae75

Browse files
committed
Merge tag 'drm-misc-next-2024-08-01' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.12: UAPI Changes: virtio: - Define DRM capset Cross-subsystem Changes: dma-buf: - heaps: Clean up documentation printk: - Pass description to kmsg_dump() Core Changes: CI: - Update IGT tests - Point upstream repo to GitLab instance modesetting: - Introduce Power Saving Policy property for connectors - Add might_fault() to drm_modeset_lock priming - Add dynamic per-crtc vblank configuration support panic: - Avoid build-time interference with framebuffer console docs: - Document Colorspace property scheduler: - Remove full_recover from drm_sched_start TTM: - Make LRU walk restartable after dropping locks - Allow direct reclaim to allocate local memory Driver Changes: amdgpu: - Support Power Saving Policy connector property ast: - astdp: Support AST2600 with VGA; Clean up HPD bridge: - Silence error message on -EPROBE_DEFER - analogix: Clean aup - bridge-connector: Fix double free - lt6505: Disable interrupt when powered off - tc358767: Make default DP port preemphasis configurable gma500: - Update i2c terminology ivpu: - Add MODULE_FIRMWARE() lcdif: - Fix pixel clock loongson: - Use GEM refcount over TTM's mgag200: - Improve BMC handling - Support VBLANK intterupts nouveau: - Refactor and clean up internals - Use GEM refcount over TTM's panel: - Shutdown fixes plus documentation - Refactor several drivers for better code sharing - boe-th101mb31ig002: Support for starry-er88577 MIPI-DSI panel plus DT; Fix porch parameter - edp: Support AOU B116XTN02.3, AUO B116XAN06.1, AOU B116XAT04.1, BOE NV140WUM-N41, BOE NV133WUM-N63, BOE NV116WHM-A4D, CMN N116BCA-EA2, CMN N116BCP-EA2, CSW MNB601LS1-4 - himax-hx8394: Support Microchip AC40T08A MIPI Display panel plus DT - ilitek-ili9806e: Support Densitron DMT028VGHMCMI-1D TFT plus DT - jd9365da: Support Melfas lmfbx101117480 MIPI-DSI panel plus DT; Refactor for code sharing sti: - Fix module owner stm: - Avoid UAF wih managed plane and CRTC helpers - Fix module owner - Fix error handling in probe - Depend on COMMON_CLK - ltdc: Fix transparency after disabling plane; Remove unused interrupt tegra: - Call drm_atomic_helper_shutdown() v3d: - Clean up perfmon vkms: - Clean up Signed-off-by: Daniel Vetter <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents a4172af + d97e71e commit 91dae75

File tree

313 files changed

+4707
-6117
lines changed

Some content is hidden

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

313 files changed

+4707
-6117
lines changed

Documentation/accel/qaic/qaic.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ DRM_IOCTL_QAIC_PERF_STATS_BO
147147
recent execution of a BO. This allows userspace to construct an end to end
148148
timeline of the BO processing for a performance analysis.
149149

150-
DRM_IOCTL_QAIC_PART_DEV
151-
This IOCTL allows userspace to request a duplicate "shadow device". This extra
152-
accelN device is associated with a specific partition of resources on the
153-
AIC100 device and can be used for limiting a process to some subset of
154-
resources.
155-
156150
DRM_IOCTL_QAIC_DETACH_SLICE_BO
157151
This IOCTL allows userspace to remove the slicing information from a BO that
158152
was originally provided by a call to DRM_IOCTL_QAIC_ATTACH_SLICE_BO. This

Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,31 @@ properties:
9292
reference to a valid DPI output or input endpoint node.
9393
9494
port@2:
95-
$ref: /schemas/graph.yaml#/properties/port
95+
$ref: /schemas/graph.yaml#/$defs/port-base
96+
unevaluatedProperties: false
9697
description: |
9798
eDP/DP output port. The remote endpoint phandle should be a
9899
reference to a valid eDP panel input endpoint node. This port is
99100
optional, treated as DP panel if not defined
100101
102+
properties:
103+
endpoint:
104+
$ref: /schemas/media/video-interfaces.yaml#
105+
unevaluatedProperties: false
106+
107+
properties:
108+
toshiba,pre-emphasis:
109+
description:
110+
Display port output Pre-Emphasis settings for both DP lanes.
111+
$ref: /schemas/types.yaml#/definitions/uint8-array
112+
minItems: 2
113+
maxItems: 2
114+
items:
115+
enum:
116+
- 0 # No pre-emphasis
117+
- 1 # 3.5dB pre-emphasis
118+
- 2 # 6dB pre-emphasis
119+
101120
oneOf:
102121
- required:
103122
- port@0

Documentation/devicetree/bindings/display/panel/boe,th101mb31ig002-28a.yaml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ title: BOE TH101MB31IG002-28A WXGA DSI Display Panel
99
maintainers:
1010
- Manuel Traut <[email protected]>
1111

12-
allOf:
13-
- $ref: panel-common.yaml#
14-
1512
properties:
1613
compatible:
1714
enum:
1815
# BOE TH101MB31IG002-28A 10.1" WXGA TFT LCD panel
1916
- boe,th101mb31ig002-28a
17+
# The Starry-er88577 is a 10.1" WXGA TFT-LCD panel
18+
- starry,er88577
2019

2120
reg:
2221
maxItems: 1
2322

2423
backlight: true
2524
enable-gpios: true
25+
reset-gpios: true
2626
power-supply: true
2727
port: true
2828
rotation: true
@@ -33,6 +33,20 @@ required:
3333
- enable-gpios
3434
- power-supply
3535

36+
allOf:
37+
- $ref: panel-common.yaml#
38+
- if:
39+
properties:
40+
compatible:
41+
# The Starry-er88577 is a 10.1" WXGA TFT-LCD panel
42+
const: starry,er88577
43+
then:
44+
properties:
45+
reset-gpios: false
46+
else:
47+
required:
48+
- reset-gpios
49+
3650
additionalProperties: false
3751

3852
examples:
@@ -47,6 +61,7 @@ examples:
4761
reg = <0>;
4862
backlight = <&backlight_lcd0>;
4963
enable-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;
64+
reset-gpios = <&gpio 55 GPIO_ACTIVE_LOW>;
5065
rotation = <90>;
5166
power-supply = <&vcc_3v3>;
5267
port {

Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ description:
1515
such as the HannStar HSD060BHW4 720x1440 TFT LCD panel connected with
1616
a MIPI-DSI video interface.
1717

18-
allOf:
19-
- $ref: panel-common.yaml#
20-
2118
properties:
2219
compatible:
2320
items:
2421
- enum:
2522
- hannstar,hsd060bhw4
23+
- microchip,ac40t08a-mipi-panel
2624
- powkiddy,x55-panel
2725
- const: himax,hx8394
2826

@@ -46,14 +44,25 @@ properties:
4644
required:
4745
- compatible
4846
- reg
49-
- reset-gpios
5047
- backlight
5148
- port
5249
- vcc-supply
5350
- iovcc-supply
5451

5552
additionalProperties: false
5653

54+
allOf:
55+
- $ref: panel-common.yaml#
56+
- if:
57+
not:
58+
properties:
59+
compatible:
60+
enum:
61+
- microchip,ac40t08a-mipi-panel
62+
then:
63+
required:
64+
- reset-gpios
65+
5766
examples:
5867
- |
5968
#include <dt-bindings/gpio/gpio.h>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
compatible:
1717
items:
1818
- enum:
19+
- densitron,dmt028vghmcmi-1d
1920
- ortustech,com35h3p70ulc
2021
- const: ilitek,ili9806e
2122

Documentation/devicetree/bindings/display/panel/jadard,jd9365da-h3.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- enum:
1919
- chongzhou,cz101b4001
2020
- kingdisplay,kd101ne3-40ti
21+
- melfas,lmfbx101117480
2122
- radxa,display-10hd-ad001
2223
- radxa,display-8hd-ad002
2324
- const: jadard,jd9365da-h3

Documentation/gpu/todo.rst

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -475,25 +475,22 @@ Remove disable/unprepare in remove/shutdown in panel-simple and panel-edp
475475
As of commit d2aacaf07395 ("drm/panel: Check for already prepared/enabled in
476476
drm_panel"), we have a check in the drm_panel core to make sure nobody
477477
double-calls prepare/enable/disable/unprepare. Eventually that should probably
478-
be turned into a WARN_ON() or somehow made louder, but right now we actually
479-
expect it to trigger and so we don't want it to be too loud.
480-
481-
Specifically, that warning will trigger for panel-edp and panel-simple at
482-
shutdown time because those panels hardcode a call to drm_panel_disable()
483-
and drm_panel_unprepare() at shutdown and remove time that they call regardless
484-
of panel state. On systems with a properly coded DRM modeset driver that
485-
calls drm_atomic_helper_shutdown() this is pretty much guaranteed to cause
486-
the warning to fire.
487-
488-
Unfortunately we can't safely remove the calls in panel-edp and panel-simple
489-
until we're sure that all DRM modeset drivers that are used with those panels
490-
properly call drm_atomic_helper_shutdown(). This TODO item is to validate
491-
that all DRM modeset drivers used with panel-edp and panel-simple properly
492-
call drm_atomic_helper_shutdown() and then remove the calls to
493-
disable/unprepare from those panels. Alternatively, this TODO item could be
494-
removed by convincing stakeholders that those calls are fine and downgrading
495-
the error message in drm_panel_disable() / drm_panel_unprepare() to a
496-
debug-level message.
478+
be turned into a WARN_ON() or somehow made louder.
479+
480+
At the moment, we expect that we may still encounter the warnings in the
481+
drm_panel core when using panel-simple and panel-edp. Since those panel
482+
drivers are used with a lot of different DRM modeset drivers they still
483+
make an extra effort to disable/unprepare the panel themsevles at shutdown
484+
time. Specifically we could still encounter those warnings if the panel
485+
driver gets shutdown() _before_ the DRM modeset driver and the DRM modeset
486+
driver properly calls drm_atomic_helper_shutdown() in its own shutdown()
487+
callback. Warnings could be avoided in such a case by using something like
488+
device links to ensure that the panel gets shutdown() after the DRM modeset
489+
driver.
490+
491+
Once all DRM modeset drivers are known to shutdown properly, the extra
492+
calls to disable/unprepare in remove/shutdown in panel-simple and panel-edp
493+
should be removed and this TODO item marked complete.
497494

498495
Contact: Douglas Anderson <[email protected]>
499496

MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,13 @@ S: Supported
10131013
T: git https://gitlab.freedesktop.org/agd5f/linux.git
10141014
F: drivers/gpu/drm/amd/display/
10151015

1016+
AMD DISPLAY CORE - DML
1017+
M: Chaitanya Dhere <[email protected]>
1018+
M: Jun Lei <[email protected]>
1019+
S: Supported
1020+
F: drivers/gpu/drm/amd/display/dc/dml/
1021+
F: drivers/gpu/drm/amd/display/dc/dml2/
1022+
10161023
AMD FAM15H PROCESSOR POWER MONITORING DRIVER
10171024
M: Huang Rui <[email protected]>
10181025
@@ -6660,6 +6667,7 @@ F: drivers/dma-buf/dma-heap.c
66606667
F: drivers/dma-buf/heaps/*
66616668
F: include/linux/dma-heap.h
66626669
F: include/uapi/linux/dma-heap.h
6670+
F: tools/testing/selftests/dmabuf-heaps/
66636671

66646672
DMC FREQUENCY DRIVER FOR SAMSUNG EXYNOS5422
66656673
M: Lukasz Luba <[email protected]>

arch/powerpc/kernel/nvram_64.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static const char *nvram_os_partitions[] = {
7373
};
7474

7575
static void oops_to_nvram(struct kmsg_dumper *dumper,
76-
enum kmsg_dump_reason reason);
76+
struct kmsg_dump_detail *detail);
7777

7878
static struct kmsg_dumper nvram_kmsg_dumper = {
7979
.dump = oops_to_nvram
@@ -643,7 +643,7 @@ void __init nvram_init_oops_partition(int rtas_partition_exists)
643643
* partition. If that's too much, go back and capture uncompressed text.
644644
*/
645645
static void oops_to_nvram(struct kmsg_dumper *dumper,
646-
enum kmsg_dump_reason reason)
646+
struct kmsg_dump_detail *detail)
647647
{
648648
struct oops_log_info *oops_hdr = (struct oops_log_info *)oops_buf;
649649
static unsigned int oops_count = 0;
@@ -655,7 +655,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
655655
unsigned int err_type = ERR_TYPE_KERNEL_PANIC_GZ;
656656
int rc = -1;
657657

658-
switch (reason) {
658+
switch (detail->reason) {
659659
case KMSG_DUMP_SHUTDOWN:
660660
/* These are almost always orderly shutdowns. */
661661
return;
@@ -671,7 +671,7 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,
671671
break;
672672
default:
673673
pr_err("%s: ignoring unrecognized KMSG_DUMP_* reason %d\n",
674-
__func__, (int) reason);
674+
__func__, (int) detail->reason);
675675
return;
676676
}
677677

arch/powerpc/platforms/powernv/opal-kmsg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
* message, it just ensures that OPAL completely flushes the console buffer.
2121
*/
2222
static void kmsg_dump_opal_console_flush(struct kmsg_dumper *dumper,
23-
enum kmsg_dump_reason reason)
23+
struct kmsg_dump_detail *detail)
2424
{
2525
/*
2626
* Outside of a panic context the pollers will continue to run,
2727
* so we don't need to do any special flushing.
2828
*/
29-
if (reason != KMSG_DUMP_PANIC)
29+
if (detail->reason != KMSG_DUMP_PANIC)
3030
return;
3131

3232
opal_flush_console(0);

0 commit comments

Comments
 (0)