Skip to content

Commit 915b6d0

Browse files
airliedairlied
committed
Merge tag 'drm-misc-next-2023-10-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.7-rc1: drm-misc-next-2023-10-19 + following: UAPI Changes: Cross-subsystem Changes: - Convert fbdev drivers to use fbdev i/o mem helpers. Core Changes: - Use cross-references for macros in docs. - Make drm_client_buffer_addb use addfb2. - Add NV20 and NV30 YUV formats. - Documentation updates for create_dumb ioctl. - CI fixes. - Allow variable number of run-queues in scheduler. Driver Changes: - Rename drm/ast constants. - Make ili9882t its own driver. - Assorted fixes in ivpu, vc4, bridge/synopsis, amdgpu. - Add planar formats to rockchip. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 5258dfd + b704380 commit 915b6d0

File tree

192 files changed

+4684
-1675
lines changed

Some content is hidden

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

192 files changed

+4684
-1675
lines changed

‎Documentation/devicetree/bindings/display/bridge/fsl,imx93-mipi-dsi.yaml

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/bridge/fsl,imx93-mipi-dsi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX93 specific extensions to Synopsys Designware MIPI DSI
8+
9+
maintainers:
10+
- Liu Ying <[email protected]>
11+
12+
description: |
13+
There is a Synopsys Designware MIPI DSI Host Controller and a Synopsys
14+
Designware MIPI DPHY embedded in Freescale i.MX93 SoC. Some configurations
15+
and extensions to them are controlled by i.MX93 media blk-ctrl.
16+
17+
allOf:
18+
- $ref: snps,dw-mipi-dsi.yaml#
19+
20+
properties:
21+
compatible:
22+
const: fsl,imx93-mipi-dsi
23+
24+
clocks:
25+
items:
26+
- description: apb clock
27+
- description: pixel clock
28+
- description: PHY configuration clock
29+
- description: PHY reference clock
30+
31+
clock-names:
32+
items:
33+
- const: pclk
34+
- const: pix
35+
- const: phy_cfg
36+
- const: phy_ref
37+
38+
interrupts:
39+
maxItems: 1
40+
41+
fsl,media-blk-ctrl:
42+
$ref: /schemas/types.yaml#/definitions/phandle
43+
description:
44+
i.MX93 media blk-ctrl, as a syscon, controls pixel component bit map
45+
configurations from LCDIF display controller to the MIPI DSI host
46+
controller and MIPI DPHY PLL related configurations through PLL SoC
47+
interface.
48+
49+
power-domains:
50+
maxItems: 1
51+
52+
required:
53+
- compatible
54+
- interrupts
55+
- fsl,media-blk-ctrl
56+
- power-domains
57+
58+
unevaluatedProperties: false
59+
60+
examples:
61+
- |
62+
#include <dt-bindings/clock/imx93-clock.h>
63+
#include <dt-bindings/gpio/gpio.h>
64+
#include <dt-bindings/interrupt-controller/arm-gic.h>
65+
#include <dt-bindings/power/fsl,imx93-power.h>
66+
67+
dsi@4ae10000 {
68+
compatible = "fsl,imx93-mipi-dsi";
69+
reg = <0x4ae10000 0x10000>;
70+
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
71+
clocks = <&clk IMX93_CLK_MIPI_DSI_GATE>,
72+
<&clk IMX93_CLK_MEDIA_DISP_PIX>,
73+
<&clk IMX93_CLK_MIPI_PHY_CFG>,
74+
<&clk IMX93_CLK_24M>;
75+
clock-names = "pclk", "pix", "phy_cfg", "phy_ref";
76+
fsl,media-blk-ctrl = <&media_blk_ctrl>;
77+
power-domains = <&media_blk_ctrl IMX93_MEDIABLK_PD_MIPI_DSI>;
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
panel@0 {
82+
compatible = "raydium,rm67191";
83+
reg = <0>;
84+
reset-gpios = <&adp5585gpio 6 GPIO_ACTIVE_LOW>;
85+
dsi-lanes = <4>;
86+
video-mode = <2>;
87+
88+
port {
89+
panel_in: endpoint {
90+
remote-endpoint = <&dsi_out>;
91+
};
92+
};
93+
};
94+
95+
ports {
96+
#address-cells = <1>;
97+
#size-cells = <0>;
98+
99+
port@0 {
100+
reg = <0>;
101+
102+
dsi_to_lcdif: endpoint {
103+
remote-endpoint = <&lcdif_to_dsi>;
104+
};
105+
};
106+
107+
port@1 {
108+
reg = <1>;
109+
110+
dsi_out: endpoint {
111+
remote-endpoint = <&panel_in>;
112+
};
113+
};
114+
};
115+
};

‎Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ properties:
2222
enum:
2323
# Anberic RG353V-V2 5.0" 640x480 TFT LCD panel
2424
- anbernic,rg353v-panel-v2
25+
# Powkiddy RGB30 3.0" 720x720 TFT LCD panel
26+
- powkiddy,rgb30-panel
2527
# Rocktech JH057N00900 5.5" 720x1440 TFT LCD panel
2628
- rocktech,jh057n00900
2729
# Xingbangda XBD599 5.99" 720x1440 TFT LCD panel

‎Documentation/devicetree/bindings/display/solomon,ssd-common.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/solomon,ssd-common.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Common properties for Solomon OLED Display Controllers
8+
9+
maintainers:
10+
- Javier Martinez Canillas <[email protected]>
11+
12+
properties:
13+
reg:
14+
maxItems: 1
15+
16+
reset-gpios:
17+
maxItems: 1
18+
19+
# Only required for SPI
20+
dc-gpios:
21+
description:
22+
GPIO connected to the controller's D/C# (Data/Command) pin,
23+
that is needed for 4-wire SPI to tell the controller if the
24+
data sent is for a command register or the display data RAM
25+
maxItems: 1
26+
27+
solomon,height:
28+
$ref: /schemas/types.yaml#/definitions/uint32
29+
description:
30+
Height in pixel of the screen driven by the controller.
31+
The default value is controller-dependent.
32+
33+
solomon,width:
34+
$ref: /schemas/types.yaml#/definitions/uint32
35+
description:
36+
Width in pixel of the screen driven by the controller.
37+
The default value is controller-dependent.
38+
39+
allOf:
40+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
41+
42+
additionalProperties: true

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

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,12 @@ properties:
2727
- solomon,ssd1307
2828
- solomon,ssd1309
2929

30-
reg:
31-
maxItems: 1
32-
3330
pwms:
3431
maxItems: 1
3532

36-
reset-gpios:
37-
maxItems: 1
38-
39-
# Only required for SPI
40-
dc-gpios:
41-
description:
42-
GPIO connected to the controller's D/C# (Data/Command) pin,
43-
that is needed for 4-wire SPI to tell the controller if the
44-
data sent is for a command register or the display data RAM
45-
maxItems: 1
46-
4733
vbat-supply:
4834
description: The supply for VBAT
4935

50-
solomon,height:
51-
$ref: /schemas/types.yaml#/definitions/uint32
52-
description:
53-
Height in pixel of the screen driven by the controller.
54-
The default value is controller-dependent.
55-
56-
solomon,width:
57-
$ref: /schemas/types.yaml#/definitions/uint32
58-
description:
59-
Width in pixel of the screen driven by the controller.
60-
The default value is controller-dependent.
61-
6236
solomon,page-offset:
6337
$ref: /schemas/types.yaml#/definitions/uint32
6438
default: 1
@@ -148,7 +122,7 @@ required:
148122
- reg
149123

150124
allOf:
151-
- $ref: /schemas/spi/spi-peripheral-props.yaml#
125+
- $ref: solomon,ssd-common.yaml#
152126

153127
- if:
154128
properties:

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

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/solomon,ssd132x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Solomon SSD132x OLED Display Controllers
8+
9+
maintainers:
10+
- Javier Martinez Canillas <[email protected]>
11+
12+
properties:
13+
compatible:
14+
- enum:
15+
- solomon,ssd1322
16+
- solomon,ssd1325
17+
- solomon,ssd1327
18+
19+
required:
20+
- compatible
21+
- reg
22+
23+
allOf:
24+
- $ref: solomon,ssd-common.yaml#
25+
26+
- if:
27+
properties:
28+
compatible:
29+
contains:
30+
const: solomon,ssd1322
31+
then:
32+
properties:
33+
width:
34+
default: 480
35+
height:
36+
default: 128
37+
38+
- if:
39+
properties:
40+
compatible:
41+
contains:
42+
const: solomon,ssd1325
43+
then:
44+
properties:
45+
width:
46+
default: 128
47+
height:
48+
default: 80
49+
50+
- if:
51+
properties:
52+
compatible:
53+
contains:
54+
const: solomon,ssd1327
55+
then:
56+
properties:
57+
width:
58+
default: 128
59+
height:
60+
default: 128
61+
62+
unevaluatedProperties: false
63+
64+
examples:
65+
- |
66+
i2c {
67+
#address-cells = <1>;
68+
#size-cells = <0>;
69+
70+
oled@3c {
71+
compatible = "solomon,ssd1327";
72+
reg = <0x3c>;
73+
reset-gpios = <&gpio2 7>;
74+
};
75+
76+
};
77+
- |
78+
spi {
79+
#address-cells = <1>;
80+
#size-cells = <0>;
81+
82+
oled@0 {
83+
compatible = "solomon,ssd1327";
84+
reg = <0x0>;
85+
reset-gpios = <&gpio2 7>;
86+
dc-gpios = <&gpio2 8>;
87+
spi-max-frequency = <10000000>;
88+
};
89+
};

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,8 @@ patternProperties:
10811081
description: Powertip Tech. Corp.
10821082
"^powervr,.*":
10831083
description: PowerVR (deprecated, use img)
1084+
"^powkiddy,.*":
1085+
description: Powkiddy
10841086
"^primux,.*":
10851087
description: Primux Trading, S.L.
10861088
"^probox2,.*":

‎Documentation/gpu/automated_testing.rst

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,19 @@ Lists the tests that for a given driver on a specific hardware revision are
6767
known to behave unreliably. These tests won't cause a job to fail regardless of
6868
the result. They will still be run.
6969

70+
Each new flake entry must be associated with a link to the email reporting the
71+
bug to the author of the affected driver, the board name or Device Tree name of
72+
the board, the first kernel version affected, and an approximation of the
73+
failure rate.
74+
75+
They should be provided under the following format::
76+
77+
# Bug Report: $LORE_OR_PATCHWORK_URL
78+
# Board Name: broken-board.dtb
79+
# Version: 6.6-rc1
80+
# Failure Rate: 100
81+
flaky-test
82+
7083
drivers/gpu/drm/ci/${DRIVER_NAME}-${HW_REVISION}-skips.txt
7184
-----------------------------------------------------------
7285

@@ -86,10 +99,13 @@ https://gitlab.freedesktop.org/janedoe/linux/-/settings/ci_cd), change the
8699
CI/CD configuration file from .gitlab-ci.yml to
87100
drivers/gpu/drm/ci/gitlab-ci.yml.
88101

89-
3. Next time you push to this repository, you will see a CI pipeline being
102+
3. Request to be added to the drm/ci-ok group so that your user has the
103+
necessary privileges to run the CI on https://gitlab.freedesktop.org/drm/ci-ok
104+
105+
4. Next time you push to this repository, you will see a CI pipeline being
90106
created (eg. https://gitlab.freedesktop.org/janedoe/linux/-/pipelines)
91107

92-
4. The various jobs will be run and when the pipeline is finished, all jobs
108+
5. The various jobs will be run and when the pipeline is finished, all jobs
93109
should be green unless a regression has been found.
94110

95111

‎Documentation/gpu/drm-kms.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,8 @@ Format Functions Reference
360360
.. kernel-doc:: drivers/gpu/drm/drm_fourcc.c
361361
:export:
362362

363+
.. _kms_dumb_buffer_objects:
364+
363365
Dumb Buffer Objects
364366
===================
365367

‎Documentation/gpu/drm-uapi.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,12 +527,12 @@ VBlank event handling
527527

528528
The DRM core exposes two vertical blank related ioctls:
529529

530-
DRM_IOCTL_WAIT_VBLANK
530+
:c:macro:`DRM_IOCTL_WAIT_VBLANK`
531531
This takes a struct drm_wait_vblank structure as its argument, and
532532
it is used to block or request a signal when a specified vblank
533533
event occurs.
534534

535-
DRM_IOCTL_MODESET_CTL
535+
:c:macro:`DRM_IOCTL_MODESET_CTL`
536536
This was only used for user-mode-settind drivers around modesetting
537537
changes to allow the kernel to update the vblank interrupt after
538538
mode setting, since on many devices the vertical blank counter is
@@ -555,8 +555,8 @@ The index is used in cases where a densely packed identifier for a CRTC is
555555
needed, for instance a bitmask of CRTC's. The member possible_crtcs of struct
556556
drm_mode_get_plane is an example.
557557

558-
DRM_IOCTL_MODE_GETRESOURCES populates a structure with an array of CRTC ID's,
559-
and the CRTC index is its position in this array.
558+
:c:macro:`DRM_IOCTL_MODE_GETRESOURCES` populates a structure with an array of
559+
CRTC ID's, and the CRTC index is its position in this array.
560560

561561
.. kernel-doc:: include/uapi/drm/drm.h
562562
:internal:

0 commit comments

Comments
 (0)