Skip to content

Commit 68de345

Browse files
airliedairlied
committed
Merge tag 'drm-misc-next-2023-01-24' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.3: UAPI Changes: Cross-subsystem Changes: Core Changes: * EDID: Improved mode parsing and refactoring * fbdev: Cleanups * format-helper: Add conversion from XRGB8888 to XBGR8888 and ABGR8888 Driver Changes: * accel/ivpu: Add driver for Intel VPU accelerator * bridge: Support i.MX93 LDB plus DT bindings * exynos: Fixes * panel: vtdr6130: Fixes; Support AUO A030JTN01 plus DT bindings * simpledrm: Support system-memory framebuffers plus DT bindings * ssd130x: Fix sparse warning Signed-off-by: Dave Airlie <airlied@redhat.com> # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmPQN9YACgkQaA3BHVML # eiNmmQf/bTV3oaMo55i3tYxhMCWYDtPVk+GGglDAykW7Lid8pvy6mJqJoW6uvgQF # c6CcoY+6yG2WvnVLhXyhPaACiG5weQSdu3S/DdZ2nuJCb50YCwWNNKcu3qYnLVlz # 2NQ/s0HN+Xvvy76GJFNarKlxSNADPWCNJ8wExAdBkWr7q8NiDfsWuMGrQRQORrm3 # zEkSJPKtWNHa+vmsQOO9yebD0LFx97CoU40FrVXZTtF0FugGIXjiknQwekzuFxdY # fGBiFKsI+Y3s51gAppbmRRJ0jGLj3KDF5S+5GM8FNbgJQF67Wxttl/YtY6lJGcsa # l0vpRoCe1ilhNVvoikzAu7UewkPKKA== # =GLLt # -----END PGP SIGNATURE----- # gpg: Signature made Wed 25 Jan 2023 05:56:06 AEST # gpg: using RSA key 7217FBAC8CE9CF6344A168E5680DC11D530B7A23 # gpg: Can't check signature: No public key From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/Y9A5ceDknyQixM3R@linux-uq9g
2 parents 7dd1be3 + 51affef commit 68de345

58 files changed

Lines changed: 9787 additions & 308 deletions

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/bridge/fsl,ldb.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ description: |
1616
1717
properties:
1818
compatible:
19-
const: fsl,imx8mp-ldb
19+
enum:
20+
- fsl,imx8mp-ldb
21+
- fsl,imx93-ldb
2022

2123
clocks:
2224
maxItems: 1
@@ -57,6 +59,18 @@ required:
5759
- clocks
5860
- ports
5961

62+
allOf:
63+
- if:
64+
properties:
65+
compatible:
66+
contains:
67+
const: fsl,imx93-ldb
68+
then:
69+
properties:
70+
ports:
71+
properties:
72+
port@2: false
73+
6074
additionalProperties: false
6175

6276
examples:

‎Documentation/devicetree/bindings/display/panel/auo,a030jtn01.yaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/auo,a030jtn01.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AUO A030JTN01 3.0" (320x480 pixels) 24-bit TFT LCD panel
8+
9+
description: |
10+
Delta RGB 8-bit panel found in some Retrogame handhelds
11+
12+
maintainers:
13+
- Paul Cercueil <paul@crapouillou.net>
14+
- Christophe Branchereau <cbranchereau@gmail.com>
15+
16+
allOf:
17+
- $ref: panel-common.yaml#
18+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
19+
20+
properties:
21+
compatible:
22+
const: auo,a030jtn01
23+
24+
reg:
25+
maxItems: 1
26+
27+
required:
28+
- compatible
29+
- reg
30+
- power-supply
31+
- reset-gpios
32+
33+
unevaluatedProperties: false
34+
35+
examples:
36+
- |
37+
#include <dt-bindings/gpio/gpio.h>
38+
39+
spi {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
43+
panel@0 {
44+
compatible = "auo,a030jtn01";
45+
reg = <0>;
46+
47+
spi-max-frequency = <10000000>;
48+
49+
reset-gpios = <&gpe 4 GPIO_ACTIVE_LOW>;
50+
power-supply = <&lcd_power>;
51+
52+
backlight = <&backlight>;
53+
54+
port {
55+
panel_input: endpoint {
56+
remote-endpoint = <&panel_output>;
57+
};
58+
};
59+
};
60+
};

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ properties:
6363
reg:
6464
description: Location and size of the framebuffer memory
6565

66+
memory-region:
67+
maxItems: 1
68+
description: Phandle to a node describing the memory to be used for the
69+
framebuffer. If present, overrides the "reg" property (if one exists).
70+
6671
clocks:
6772
description: List of clocks used by the framebuffer.
6873

@@ -94,6 +99,7 @@ properties:
9499
* `x1r5g5b5` - 16-bit pixels, d[14:10]=r, d[9:5]=g, d[4:0]=b
95100
* `x2r10g10b10` - 32-bit pixels, d[29:20]=r, d[19:10]=g, d[9:0]=b
96101
* `x8r8g8b8` - 32-bit pixels, d[23:16]=r, d[15:8]=g, d[7:0]=b
102+
* `x8b8g8r8` - 32-bit pixels, d[23:16]=b, d[15:8]=g, d[7:0]=r
97103
enum:
98104
- a1r5g5b5
99105
- a2r10g10b10
@@ -105,6 +111,7 @@ properties:
105111
- x1r5g5b5
106112
- x2r10g10b10
107113
- x8r8g8b8
114+
- x8b8g8r8
108115

109116
display:
110117
$ref: /schemas/types.yaml#/definitions/phandle

‎Documentation/devicetree/bindings/reserved-memory/framebuffer.yaml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/reserved-memory/framebuffer.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: /reserved-memory framebuffer node bindings
8+
9+
maintainers:
10+
- devicetree-spec@vger.kernel.org
11+
12+
allOf:
13+
- $ref: reserved-memory.yaml
14+
15+
properties:
16+
compatible:
17+
const: framebuffer
18+
description: >
19+
This indicates a region of memory meant to be used as a framebuffer for
20+
a set of display devices. It can be used by an operating system to keep
21+
the framebuffer from being overwritten and use it as the backing memory
22+
for a display device (such as simple-framebuffer).
23+
24+
unevaluatedProperties: false
25+
26+
examples:
27+
- |
28+
/ {
29+
compatible = "foo";
30+
model = "foo";
31+
#address-cells = <1>;
32+
#size-cells = <1>;
33+
34+
chosen {
35+
framebuffer {
36+
compatible = "simple-framebuffer";
37+
memory-region = <&fb>;
38+
};
39+
};
40+
41+
reserved-memory {
42+
#address-cells = <1>;
43+
#size-cells = <1>;
44+
ranges;
45+
46+
fb: framebuffer@80000000 {
47+
compatible = "framebuffer";
48+
reg = <0x80000000 0x007e9000>;
49+
};
50+
};
51+
};
52+
...

‎MAINTAINERS‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6894,6 +6894,15 @@ T: git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/accel.git
68946894
F: Documentation/accel/
68956895
F: drivers/accel/
68966896

6897+
DRM ACCEL DRIVERS FOR INTEL VPU
6898+
M: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
6899+
M: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
6900+
L: dri-devel@lists.freedesktop.org
6901+
S: Supported
6902+
T: git git://anongit.freedesktop.org/drm/drm-misc
6903+
F: drivers/accel/ivpu/
6904+
F: include/uapi/drm/ivpu_accel.h
6905+
68976906
DRM DRIVERS FOR ALLWINNER A10
68986907
M: Maxime Ripard <mripard@kernel.org>
68996908
M: Chen-Yu Tsai <wens@csie.org>
@@ -6986,8 +6995,10 @@ F: drivers/gpu/drm/gma500/
69866995
DRM DRIVERS FOR HISILICON
69876996
M: Xinliang Liu <xinliang.liu@linaro.org>
69886997
M: Tian Tao <tiantao6@hisilicon.com>
6989-
R: John Stultz <jstultz@google.com>
69906998
R: Xinwei Kong <kong.kongxinwei@hisilicon.com>
6999+
R: Sumit Semwal <sumit.semwal@linaro.org>
7000+
R: Yongqin Liu <yongqin.liu@linaro.org>
7001+
R: John Stultz <jstultz@google.com>
69917002
L: dri-devel@lists.freedesktop.org
69927003
S: Maintained
69937004
T: git git://anongit.freedesktop.org/drm/drm-misc

‎drivers/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,3 +189,4 @@ obj-$(CONFIG_COUNTER) += counter/
189189
obj-$(CONFIG_MOST) += most/
190190
obj-$(CONFIG_PECI) += peci/
191191
obj-$(CONFIG_HTE) += hte/
192+
obj-$(CONFIG_DRM_ACCEL) += accel/

‎drivers/accel/Kconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ menuconfig DRM_ACCEL
2222
major number than GPUs, and will be exposed to user-space using
2323
different device files, called accel/accel* (in /dev, sysfs
2424
and debugfs).
25+
26+
source "drivers/accel/ivpu/Kconfig"

‎drivers/accel/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
obj-y += ivpu/

‎drivers/accel/ivpu/Kconfig‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
config DRM_ACCEL_IVPU
4+
tristate "Intel VPU for Meteor Lake and newer"
5+
depends on DRM_ACCEL
6+
depends on X86_64 && !UML
7+
depends on PCI && PCI_MSI
8+
select FW_LOADER
9+
select SHMEM
10+
help
11+
Choose this option if you have a system that has an 14th generation Intel CPU
12+
or newer. VPU stands for Versatile Processing Unit and it's a CPU-integrated
13+
inference accelerator for Computer Vision and Deep Learning applications.
14+
15+
If "M" is selected, the module will be called intel_vpu.

‎drivers/accel/ivpu/Makefile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
# Copyright (C) 2023 Intel Corporation
3+
4+
intel_vpu-y := \
5+
ivpu_drv.o \
6+
ivpu_fw.o \
7+
ivpu_gem.o \
8+
ivpu_hw_mtl.o \
9+
ivpu_ipc.o \
10+
ivpu_job.o \
11+
ivpu_jsm_msg.o \
12+
ivpu_mmu.o \
13+
ivpu_mmu_context.o \
14+
ivpu_pm.o
15+
16+
obj-$(CONFIG_DRM_ACCEL_IVPU) += intel_vpu.o

0 commit comments

Comments
 (0)