Skip to content

Commit 8d04ea1

Browse files
airliedairlied
committed
Merge tag 'drm-misc-next-2025-09-11' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.18: UAPI Changes: - Provide 'boot_display' attribute on boot-up devices amdxdma: - Add ioctl DRM_IOCTL_AMDXDNA_GET_ARRAY Cross-subsystem Changes: bindings: - Add Mayqueen vendor prefix mayqueen- pci: - vgaarb: Use screen_info helpers Core Changes: ttm: - Add interface to populate buffers Driver Changes: amdgpu: - Pre-populate exported buffers ast: - Clean up detection of DRAM config bochs: - Clean up bridge: - adv7511: Write full Audio infoframe - ite6263: Support vendor-specific infoframes - simple: Add support for Realtek RTD2171 DP-to-HDMI plus DT bindings - Clean up gma500: - Clean up nouveau: - Pre-populate exported buffers panel: - edp: Add support for additonal mt8189 Chromebook panels - lvds: Add DT bindings for EDT ETML0700Z8DHA - Clean up pixpaper: - Add support for Mayqueen Pixpaper plus DT bindings rcar-du: - Use RUNTIME_PM_OPS - Add support for DSI commands vkms: - Support variants of ARGB8888, ARGB16161616, RGB565, RGB888 and P01x - Spport YUV with 16-bit components xe: - Pre-populate exported buffers Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://lore.kernel.org/r/20250911091737.GA39831@linux.fritz.box
2 parents b1c1c52 + 91494de commit 8d04ea1

46 files changed

Lines changed: 2423 additions & 490 deletions

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-class-drm‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /sys/class/drm/.../boot_display
2+
Date: January 2026
3+
Contact: Linux DRI developers <dri-devel@vger.kernel.org>
4+
Description:
5+
This file indicates that displays connected to the device were
6+
used to display the boot sequence. If a display connected to
7+
the device was used to display the boot sequence the file will
8+
be present and contain "1".

‎Documentation/devicetree/bindings/display/bridge/simple-bridge.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- adi,adv7123
3030
- dumb-vga-dac
3131
- radxa,ra620
32+
- realtek,rtd2171
3233
- ti,opa362
3334
- ti,ths8134
3435
- ti,ths8135

‎Documentation/devicetree/bindings/display/mayqueen,pixpaper.yaml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/mayqueen,pixpaper.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Mayqueen Pixpaper e-ink display panel
8+
9+
maintainers:
10+
- LiangCheng Wang <zaq14760@gmail.com>
11+
12+
description:
13+
The Pixpaper is an e-ink display panel controlled via an SPI interface.
14+
The panel has a resolution of 122x250 pixels and requires GPIO pins for
15+
reset, busy, and data/command control.
16+
17+
allOf:
18+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
19+
20+
properties:
21+
compatible:
22+
const: mayqueen,pixpaper
23+
24+
reg:
25+
maxItems: 1
26+
27+
spi-max-frequency:
28+
maximum: 1000000
29+
default: 1000000
30+
31+
reset-gpios:
32+
maxItems: 1
33+
34+
busy-gpios:
35+
maxItems: 1
36+
37+
dc-gpios:
38+
maxItems: 1
39+
40+
required:
41+
- compatible
42+
- reg
43+
- reset-gpios
44+
- busy-gpios
45+
- dc-gpios
46+
47+
unevaluatedProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/gpio/gpio.h>
52+
spi {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
display@0 {
56+
compatible = "mayqueen,pixpaper";
57+
reg = <0>;
58+
spi-max-frequency = <1000000>;
59+
reset-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
60+
busy-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
61+
dc-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
62+
};
63+
};

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ properties:
4848
- auo,g084sn05
4949
# Chunghwa Picture Tubes Ltd. 7" WXGA (800x1280) TFT LCD LVDS panel
5050
- chunghwa,claa070wp03xg
51+
# EDT ETML0700Z8DHA 7.0" Full HD (1920x1080) color TFT LCD LVDS panel
52+
- edt,etml0700z8dha
5153
# EDT ETML0700Z9NDHA 7.0" WSVGA (1024x600) color TFT LCD LVDS panel
5254
- edt,etml0700z9ndha
5355
# HannStar Display Corp. HSD101PWW2 10.1" WXGA (1280x800) LVDS panel

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -933,6 +933,8 @@ patternProperties:
933933
description: Maxim Integrated Products
934934
"^maxlinear,.*":
935935
description: MaxLinear Inc.
936+
"^mayqueen,.*":
937+
description: Mayqueen Technologies Ltd.
936938
"^mbvl,.*":
937939
description: Mobiveil Inc.
938940
"^mcube,.*":

‎MAINTAINERS‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ F: drivers/spi/spi-amd.c
12431243
F: drivers/spi/spi-amd.h
12441244

12451245
AMD XDNA DRIVER
1246-
M: Min Ma <min.ma@amd.com>
1246+
M: Min Ma <mamin506@gmail.com>
12471247
M: Lizhi Hou <lizhi.hou@amd.com>
12481248
L: dri-devel@lists.freedesktop.org
12491249
S: Supported
@@ -7490,7 +7490,6 @@ F: drivers/soc/ti/smartreflex.c
74907490
F: include/linux/power/smartreflex.h
74917491

74927492
DRM ACCEL DRIVERS FOR INTEL VPU
7493-
M: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
74947493
M: Maciej Falkowski <maciej.falkowski@linux.intel.com>
74957494
M: Karol Wachowski <karol.wachowski@linux.intel.com>
74967495
L: dri-devel@lists.freedesktop.org
@@ -7877,6 +7876,13 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
78777876
F: Documentation/devicetree/bindings/display/repaper.txt
78787877
F: drivers/gpu/drm/tiny/repaper.c
78797878

7879+
DRM DRIVER FOR PIXPAPER E-INK PANEL
7880+
M: LiangCheng Wang <zaq14760@gmail.com>
7881+
L: dri-devel@lists.freedesktop.org
7882+
S: Maintained
7883+
F: Documentation/devicetree/bindings/display/mayqueen,pixpaper.yaml
7884+
F: drivers/gpu/drm/tiny/pixpaper.c
7885+
78807886
DRM DRIVER FOR QEMU'S CIRRUS DEVICE
78817887
M: Dave Airlie <airlied@redhat.com>
78827888
M: Gerd Hoffmann <kraxel@redhat.com>

‎arch/parisc/include/asm/video.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
struct device;
88

9-
#if defined(CONFIG_STI_CORE)
9+
#if defined(CONFIG_STI_CORE) && defined(CONFIG_VIDEO)
1010
bool video_is_primary_device(struct device *dev);
1111
#define video_is_primary_device video_is_primary_device
1212
#endif

‎arch/sparc/include/asm/video.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot,
1919
#define pgprot_framebuffer pgprot_framebuffer
2020
#endif
2121

22+
#ifdef CONFIG_VIDEO
2223
bool video_is_primary_device(struct device *dev);
2324
#define video_is_primary_device video_is_primary_device
25+
#endif
2426

2527
static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)
2628
{

‎arch/x86/include/asm/video.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ pgprot_t pgprot_framebuffer(pgprot_t prot,
1313
unsigned long offset);
1414
#define pgprot_framebuffer pgprot_framebuffer
1515

16+
#ifdef CONFIG_VIDEO
1617
bool video_is_primary_device(struct device *dev);
1718
#define video_is_primary_device video_is_primary_device
19+
#endif
1820

1921
#include <asm-generic/video.h>
2022

‎arch/x86/video/video-common.c‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <linux/module.h>
1111
#include <linux/pci.h>
12+
#include <linux/screen_info.h>
1213
#include <linux/vgaarb.h>
1314

1415
#include <asm/video.h>
@@ -27,14 +28,36 @@ EXPORT_SYMBOL(pgprot_framebuffer);
2728

2829
bool video_is_primary_device(struct device *dev)
2930
{
31+
#ifdef CONFIG_SCREEN_INFO
32+
struct screen_info *si = &screen_info;
33+
struct resource res[SCREEN_INFO_MAX_RESOURCES];
34+
ssize_t i, numres;
35+
#endif
3036
struct pci_dev *pdev;
3137

3238
if (!dev_is_pci(dev))
3339
return false;
3440

3541
pdev = to_pci_dev(dev);
3642

37-
return (pdev == vga_default_device());
43+
if (!pci_is_display(pdev))
44+
return false;
45+
46+
if (pdev == vga_default_device())
47+
return true;
48+
49+
#ifdef CONFIG_SCREEN_INFO
50+
numres = screen_info_resources(si, res, ARRAY_SIZE(res));
51+
for (i = 0; i < numres; ++i) {
52+
if (!(res[i].flags & IORESOURCE_MEM))
53+
continue;
54+
55+
if (pci_find_resource(pdev, &res[i]))
56+
return true;
57+
}
58+
#endif
59+
60+
return false;
3861
}
3962
EXPORT_SYMBOL(video_is_primary_device);
4063

0 commit comments

Comments
 (0)