Skip to content

Commit 0de6239

Browse files
airliedairlied
committed
Merge tag 'drm-misc-next-2024-02-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.9: UAPI Changes: Cross-subsystem Changes: dma-buf: - clean up docs media: - tc358743: fix v4l device registration video: - move all kernel parameters for video behind CONFIG_VIDEO sound: - remove <drm/drm_edid.h> include from header Core Changes: ci: - add tests for msm managed: - add drmm_release_action() with tests ttm: - fix errno codes - simply busy-placement handling - fix page decryption docs: - add new external references - clean up Driver Changes: amdgpu: - clean up bridge: - imx: add i.MX8MP HDMI PVI plus DT bindings, add i.MX8MP HDMI TX plus DT bindings - samsung-dsim: add bsh-smm-s2/pro boards - sii902x: fix probing and unregistration - tc358767: limit pixel PLL input range - switch to new drm_bridge_read_edid() interface - clean up imx: - use devm_ functions during init - clean up lima: - fix memory leak loongson: - fail if no VRAM present meson: - switch to new drm_bridge_read_edid() interface nouveau: - clean up panel: - add BOE TH101MB31IG002-28A plus DT bindings - add EDT ETML1010G3DRA plus DT bindings - add Novatek NT36672E LCD DSI plus DT bindings - nt36523: support 120Hz timings, fix includes - simple: fix display timings on RK32FN48H - visionox-vtdr6130: fix initialization panel-orientation-quirks: - GPD Win Mini vmwgfx: - list command SVGA_3D_CMD_DEFINE_GB_SURFACE_V4 as invalid - fix null-pointer deref in execbuf - refactor display-mode probing - fix fencing for creating cursor MOBs - fix cursor-memory lifetime - clean up xlnx: - fix live video input for ZynqMP DPSUB Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20240208164242.GA14321@linux.fritz.box
2 parents f8e4806 + 3ce7384 commit 0de6239

File tree

133 files changed

+2633
-980
lines changed

Some content is hidden

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

133 files changed

+2633
-980
lines changed

‎Documentation/devicetree/bindings/display/bridge/fsl,imx8mp-hdmi-tx.yaml

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
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,imx8mp-hdmi-tx.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX8MP DWC HDMI TX Encoder
8+
9+
maintainers:
10+
- Lucas Stach <l.stach@pengutronix.de>
11+
12+
description:
13+
The i.MX8MP HDMI transmitter is a Synopsys DesignWare
14+
HDMI 2.0a TX controller IP.
15+
16+
allOf:
17+
- $ref: /schemas/display/bridge/synopsys,dw-hdmi.yaml#
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- fsl,imx8mp-hdmi-tx
23+
24+
reg-io-width:
25+
const: 1
26+
27+
clocks:
28+
maxItems: 4
29+
30+
clock-names:
31+
items:
32+
- const: iahb
33+
- const: isfr
34+
- const: cec
35+
- const: pix
36+
37+
power-domains:
38+
maxItems: 1
39+
40+
ports:
41+
$ref: /schemas/graph.yaml#/properties/ports
42+
43+
properties:
44+
port@0:
45+
$ref: /schemas/graph.yaml#/properties/port
46+
description: Parallel RGB input port
47+
48+
port@1:
49+
$ref: /schemas/graph.yaml#/properties/port
50+
description: HDMI output port
51+
52+
required:
53+
- port@0
54+
- port@1
55+
56+
required:
57+
- compatible
58+
- reg
59+
- clocks
60+
- clock-names
61+
- interrupts
62+
- power-domains
63+
- ports
64+
65+
unevaluatedProperties: false
66+
67+
examples:
68+
- |
69+
#include <dt-bindings/clock/imx8mp-clock.h>
70+
#include <dt-bindings/interrupt-controller/irq.h>
71+
#include <dt-bindings/power/imx8mp-power.h>
72+
73+
hdmi@32fd8000 {
74+
compatible = "fsl,imx8mp-hdmi-tx";
75+
reg = <0x32fd8000 0x7eff>;
76+
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
77+
clocks = <&clk IMX8MP_CLK_HDMI_APB>,
78+
<&clk IMX8MP_CLK_HDMI_REF_266M>,
79+
<&clk IMX8MP_CLK_32K>,
80+
<&hdmi_tx_phy>;
81+
clock-names = "iahb", "isfr", "cec", "pix";
82+
power-domains = <&hdmi_blk_ctrl IMX8MP_HDMIBLK_PD_HDMI_TX>;
83+
reg-io-width = <1>;
84+
ports {
85+
#address-cells = <1>;
86+
#size-cells = <0>;
87+
port@0 {
88+
reg = <0>;
89+
90+
hdmi_tx_from_pvi: endpoint {
91+
remote-endpoint = <&pvi_to_hdmi_tx>;
92+
};
93+
};
94+
95+
port@1 {
96+
reg = <1>;
97+
hdmi_tx_out: endpoint {
98+
remote-endpoint = <&hdmi0_con>;
99+
};
100+
};
101+
};
102+
};

‎Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: SN65DSI86 DSI to eDP bridge chip
88

99
maintainers:
10-
- Sandeep Panda <spanda@codeaurora.org>
10+
- Douglas Anderson <dianders@chromium.org>
1111

1212
description: |
1313
The Texas Instruments SN65DSI86 bridge takes MIPI DSI in and outputs eDP.

‎Documentation/devicetree/bindings/display/imx/fsl,imx8mp-hdmi-pvi.yaml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/imx/fsl,imx8mp-hdmi-pvi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX8MP HDMI Parallel Video Interface
8+
9+
maintainers:
10+
- Lucas Stach <l.stach@pengutronix.de>
11+
12+
description:
13+
The HDMI parallel video interface is a timing and sync generator block in the
14+
i.MX8MP SoC, that sits between the video source and the HDMI TX controller.
15+
16+
properties:
17+
compatible:
18+
const: fsl,imx8mp-hdmi-pvi
19+
20+
reg:
21+
maxItems: 1
22+
23+
interrupts:
24+
maxItems: 1
25+
26+
power-domains:
27+
maxItems: 1
28+
29+
ports:
30+
$ref: /schemas/graph.yaml#/properties/ports
31+
32+
properties:
33+
port@0:
34+
$ref: /schemas/graph.yaml#/properties/port
35+
description: Input from the LCDIF controller.
36+
37+
port@1:
38+
$ref: /schemas/graph.yaml#/properties/port
39+
description: Output to the HDMI TX controller.
40+
41+
required:
42+
- port@0
43+
- port@1
44+
45+
required:
46+
- compatible
47+
- reg
48+
- interrupts
49+
- power-domains
50+
- ports
51+
52+
additionalProperties: false
53+
54+
examples:
55+
- |
56+
#include <dt-bindings/interrupt-controller/irq.h>
57+
#include <dt-bindings/power/imx8mp-power.h>
58+
59+
display-bridge@32fc4000 {
60+
compatible = "fsl,imx8mp-hdmi-pvi";
61+
reg = <0x32fc4000 0x44>;
62+
interrupt-parent = <&irqsteer_hdmi>;
63+
interrupts = <12 IRQ_TYPE_LEVEL_HIGH>;
64+
power-domains = <&hdmi_blk_ctrl IMX8MP_HDMIBLK_PD_PVI>;
65+
66+
ports {
67+
#address-cells = <1>;
68+
#size-cells = <0>;
69+
70+
port@0 {
71+
reg = <0>;
72+
pvi_from_lcdif3: endpoint {
73+
remote-endpoint = <&lcdif3_to_pvi>;
74+
};
75+
};
76+
77+
port@1 {
78+
reg = <1>;
79+
pvi_to_hdmi_tx: endpoint {
80+
remote-endpoint = <&hdmi_tx_from_pvi>;
81+
};
82+
};
83+
};
84+
};

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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/boe,th101mb31ig002-28a.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: BOE TH101MB31IG002-28A WXGA DSI Display Panel
8+
9+
maintainers:
10+
- Manuel Traut <manut@mecka.net>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
# BOE TH101MB31IG002-28A 10.1" WXGA TFT LCD panel
19+
- boe,th101mb31ig002-28a
20+
21+
reg: true
22+
backlight: true
23+
enable-gpios: true
24+
power-supply: true
25+
port: true
26+
rotation: true
27+
28+
required:
29+
- compatible
30+
- reg
31+
- enable-gpios
32+
- power-supply
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
#include <dt-bindings/gpio/gpio.h>
39+
40+
dsi {
41+
#address-cells = <1>;
42+
#size-cells = <0>;
43+
panel@0 {
44+
compatible = "boe,th101mb31ig002-28a";
45+
reg = <0>;
46+
backlight = <&backlight_lcd0>;
47+
enable-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;
48+
rotation = <90>;
49+
power-supply = <&vcc_3v3>;
50+
port {
51+
panel_in_dsi: endpoint {
52+
remote-endpoint = <&dsi_out_con>;
53+
};
54+
};
55+
};
56+
};
57+
58+
...

‎Documentation/devicetree/bindings/display/panel/novatek,nt36672e.yaml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
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/novatek,nt36672e.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Novatek NT36672E LCD DSI Panel
8+
9+
maintainers:
10+
- Ritesh Kumar <quic_riteshk@quicinc.com>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: novatek,nt36672e
18+
19+
reg:
20+
maxItems: 1
21+
description: DSI virtual channel
22+
23+
vddi-supply: true
24+
avdd-supply: true
25+
avee-supply: true
26+
port: true
27+
reset-gpios: true
28+
backlight: true
29+
30+
required:
31+
- compatible
32+
- reg
33+
- vddi-supply
34+
- avdd-supply
35+
- avee-supply
36+
- reset-gpios
37+
- port
38+
39+
additionalProperties: false
40+
41+
examples:
42+
- |
43+
#include <dt-bindings/gpio/gpio.h>
44+
dsi {
45+
#address-cells = <1>;
46+
#size-cells = <0>;
47+
panel@0 {
48+
compatible = "novatek,nt36672e";
49+
reg = <0>;
50+
51+
reset-gpios = <&tlmm 44 GPIO_ACTIVE_HIGH>;
52+
53+
vddi-supply = <&vreg_l8c_1p8>;
54+
avdd-supply = <&disp_avdd>;
55+
avee-supply = <&disp_avee>;
56+
57+
backlight = <&pwm_backlight>;
58+
59+
port {
60+
panel0_in: endpoint {
61+
remote-endpoint = <&dsi0_out>;
62+
};
63+
};
64+
};
65+
};
66+
...

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ properties:
141141
- edt,etm0700g0edh6
142142
# Emerging Display Technology Corp. LVDS WSVGA TFT Display with capacitive touch
143143
- edt,etml0700y5dha
144+
# Emerging Display Technology Corp. 10.1" LVDS WXGA TFT Display with capacitive touch
145+
- edt,etml1010g3dra
144146
# Emerging Display Technology Corp. 5.7" VGA TFT LCD panel with
145147
# capacitive touch
146148
- edt,etmv570g2dhu

‎Documentation/devicetree/bindings/display/panel/visionox,rm69299.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Visionox model RM69299 Panels
88

99
maintainers:
10-
- Harigovindan P <harigovi@codeaurora.org>
10+
- Abhinav Kumar <quic_abhinavk@quicinc.com>
11+
- Jessica Zhang <quic_jesszhan@quicinc.com>
1112

1213
description: |
1314
This binding is for display panels using a Visionox RM692999 panel.

‎Documentation/gpu/drm-internals.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,6 @@ Managed Resources
153153
.. kernel-doc:: include/drm/drm_managed.h
154154
:internal:
155155

156-
Bus-specific Device Registration and PCI Support
157-
------------------------------------------------
158-
159-
A number of functions are provided to help with device registration. The
160-
functions deal with PCI and platform devices respectively and are only
161-
provided for historical reasons. These are all deprecated and shouldn't
162-
be used in new drivers. Besides that there's a few helpers for pci
163-
drivers.
164-
165-
.. kernel-doc:: drivers/gpu/drm/drm_pci.c
166-
:export:
167-
168156
Open/Close, File Operations and IOCTLs
169157
======================================
170158

‎Documentation/gpu/introduction.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ Conference talks
164164
Slides and articles
165165
-------------------
166166

167+
* `The Linux graphics stack in a nutshell, part 1 <https://lwn.net/Articles/955376/>`_ - Thomas Zimmermann (2023)
168+
* `The Linux graphics stack in a nutshell, part 2 <https://lwn.net/Articles/955708/>`_ - Thomas Zimmermann (2023)
167169
* `Understanding the Linux Graphics Stack <https://bootlin.com/doc/training/graphics/graphics-slides.pdf>`_ - Bootlin (2022)
168170
* `DRM KMS overview <https://wiki.st.com/stm32mpu/wiki/DRM_KMS_overview>`_ - STMicroelectronics (2021)
169171
* `Linux graphic stack <https://studiopixl.com/2017-05-13/linux-graphic-stack-an-overview>`_ - Nathan Gauër (2017)

‎Documentation/gpu/rfc/index.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,3 @@ host such documentation:
3131
.. toctree::
3232

3333
i915_vm_bind.rst
34-
35-
.. toctree::
36-
37-
xe.rst

0 commit comments

Comments
 (0)