Skip to content

Commit 45215c5

Browse files
committed
Merge tag 'drm-misc-next-2025-06-12' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 6.17: UAPI Changes: Cross-subsystem Changes: Core Changes: - atomic-helpers: Tune the enable / disable sequence - bridge: Add destroy hook - color management: Add helpers for hardware gamma LUT handling - HDMI: Add CEC handling, YUV420 output support - sched: tracing improvements Driver Changes: - hyperv: Move out of simple-kms, drm_panic support - i915: drm_panel_follower support - imx: Add IMX8qxq Display Controller Support - lima: Add Rockchip RK3528 GPU Support - nouveau: fence handling cleanup - panfrost: Add BO labeling, 64-bit registers access - qaic: Add RAS Support - rz-du: Add RZ/V2H(P) Support, MIPI-DSI DCS Support - sun4i: Add H616 Support - tidss: Add TI AM62L Support - vkms: YUV and R* formats support - bridges: - Switched to reference counted drm_bridge allocations - panels: - Switched to reference counted drm_panel allocations - Add support for fwnode-based panel lookup - himax-hx8394: Support for Huiling hl055fhv028c - ilitek-ili9881c: Support for 7" Raspberry Pi 720x1280 - panel-edp: Support for KDC KD116N3730A05, N160JCE-ELL CMN, - panel-simple: Support for AUO P238HAN01 - st7701: Support for Winstar wf40eswaa6mnn0 - visionox-rm69299: Support for rm69299-shift - New panels: Renesas R61307, Renesas R69328 Signed-off-by: Dave Airlie <[email protected]> From: Maxime Ripard <[email protected]> Link: https://lore.kernel.org/r/20250612-coucal-of-impossible-cleaning-a5eecf@houat
2 parents e04c78d + c5b4393 commit 45215c5

File tree

381 files changed

+15333
-2787
lines changed

Some content is hidden

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

381 files changed

+15333
-2787
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
What: /sys/bus/pci/drivers/qaic/XXXX:XX:XX.X/ce_count
2+
Date: May 2025
3+
KernelVersion: 6.17
4+
5+
Description: Number of correctable errors received from device since driver is loaded.
6+
7+
What: /sys/bus/pci/drivers/qaic/XXXX:XX:XX.X/ue_count
8+
Date: May 2025
9+
KernelVersion: 6.17
10+
11+
Description: Number of uncorrectable errors received from device since driver is loaded.
12+
13+
What: /sys/bus/pci/drivers/qaic/XXXX:XX:XX.X/ue_nonfatal_count
14+
Date: May 2025
15+
KernelVersion: 6.17
16+
17+
Description: Number of uncorrectable non-fatal errors received from device since driver
18+
is loaded.

Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ properties:
2424
- allwinner,sun50i-a64-de2-mixer-0
2525
- allwinner,sun50i-a64-de2-mixer-1
2626
- allwinner,sun50i-h6-de3-mixer-0
27+
- allwinner,sun50i-h616-de33-mixer-0
2728

28-
reg:
29-
maxItems: 1
29+
reg: true
30+
31+
reg-names: true
3032

3133
clocks:
3234
items:
@@ -61,6 +63,34 @@ properties:
6163
required:
6264
- port@1
6365

66+
allOf:
67+
- if:
68+
properties:
69+
compatible:
70+
contains:
71+
enum:
72+
- allwinner,sun50i-h616-de33-mixer-0
73+
then:
74+
properties:
75+
reg:
76+
description: |
77+
Registers for controlling individual layers of the display
78+
engine (layers), global control (top), and display blending
79+
control (display). Names are from Allwinner BSP kernel.
80+
maxItems: 3
81+
reg-names:
82+
items:
83+
- const: layers
84+
- const: top
85+
- const: display
86+
required:
87+
- reg-names
88+
89+
else:
90+
properties:
91+
reg:
92+
maxItems: 1
93+
6494
required:
6595
- compatible
6696
- reg
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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,imx8qxp-dc-axi-performance-counter.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX8qxp Display Controller AXI Performance Counter
8+
9+
description: |
10+
Performance counters are provided to allow measurement of average bandwidth
11+
and latency during operation. The following features are supported:
12+
13+
* Manual and timer controlled measurement mode.
14+
15+
* Measurement counters:
16+
- GLOBAL_COUNTER for overall measurement time
17+
- BUSY_COUNTER for number of data bus busy cycles
18+
- DATA_COUNTER for number of data transfer cycles
19+
- TRANSFER_COUNTER for number of transfers
20+
- ADDRBUSY_COUNTER for number of address bus busy cycles
21+
- LATENCY_COUNTER for average latency
22+
23+
* Counter overflow detection.
24+
25+
* Outstanding Transfer Counters (OTC) which are used for latency measurement
26+
have to run immediately after reset, but can be disabled by software when
27+
there is no need for latency measurement.
28+
29+
maintainers:
30+
- Liu Ying <[email protected]>
31+
32+
properties:
33+
compatible:
34+
const: fsl,imx8qxp-dc-axi-performance-counter
35+
36+
reg:
37+
maxItems: 1
38+
39+
clocks:
40+
maxItems: 1
41+
42+
required:
43+
- compatible
44+
- reg
45+
- clocks
46+
47+
additionalProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/clock/imx8-lpcg.h>
52+
53+
pmu@5618f000 {
54+
compatible = "fsl,imx8qxp-dc-axi-performance-counter";
55+
reg = <0x5618f000 0x90>;
56+
clocks = <&dc0_lpcg IMX_LPCG_CLK_5>;
57+
};
Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
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,imx8qxp-dc-blit-engine.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX8qxp Display Controller Blit Engine
8+
9+
description: |
10+
A blit operation (block based image transfer) reads up to 3 source images
11+
from memory and computes one destination image from it, which is written
12+
back to memory. The following basic operations are supported:
13+
14+
* Buffer Fill
15+
Fills a buffer with constant color
16+
17+
* Buffer Copy
18+
Copies one source to a destination buffer.
19+
20+
* Image Blend
21+
Combines two source images by a blending equation and writes result to
22+
destination (which can be one of the sources).
23+
24+
* Image Rop2/3
25+
Combines up to three source images by a logical equation (raster operation)
26+
and writes result to destination (which can be one of the sources).
27+
28+
* Image Flip
29+
Mirrors the source image in horizontal and/or vertical direction.
30+
31+
* Format Convert
32+
Convert between the supported color and buffer formats.
33+
34+
* Color Transform
35+
Modify colors by linear or non-linear transformations.
36+
37+
* Image Scale
38+
Changes size of the source image.
39+
40+
* Image Rotate
41+
Rotates the source image by any angle.
42+
43+
* Image Filter
44+
Performs an FIR filter operation on the source image.
45+
46+
* Image Warp
47+
Performs a re-sampling of the source image with any pattern. The sample
48+
point positions are read from a compressed coordinate buffer.
49+
50+
* Buffer Pack
51+
Writes an image with color components stored in up to three different
52+
buffers (planar formats) into a single buffer (packed format).
53+
54+
* Chroma Resample
55+
Converts between different YUV formats that differ in chroma sampling rate
56+
(4:4:4, 4:2:2, 4:2:0).
57+
58+
maintainers:
59+
- Liu Ying <[email protected]>
60+
61+
properties:
62+
compatible:
63+
const: fsl,imx8qxp-dc-blit-engine
64+
65+
reg:
66+
maxItems: 2
67+
68+
reg-names:
69+
items:
70+
- const: pec
71+
- const: cfg
72+
73+
"#address-cells":
74+
const: 1
75+
76+
"#size-cells":
77+
const: 1
78+
79+
ranges: true
80+
81+
patternProperties:
82+
"^blitblend@[0-9a-f]+$":
83+
type: object
84+
additionalProperties: true
85+
86+
properties:
87+
compatible:
88+
const: fsl,imx8qxp-dc-blitblend
89+
90+
"^clut@[0-9a-f]+$":
91+
type: object
92+
additionalProperties: true
93+
94+
properties:
95+
compatible:
96+
const: fsl,imx8qxp-dc-clut
97+
98+
"^fetchdecode@[0-9a-f]+$":
99+
type: object
100+
additionalProperties: true
101+
102+
properties:
103+
compatible:
104+
const: fsl,imx8qxp-dc-fetchdecode
105+
106+
"^fetcheco@[0-9a-f]+$":
107+
type: object
108+
additionalProperties: true
109+
110+
properties:
111+
compatible:
112+
const: fsl,imx8qxp-dc-fetcheco
113+
114+
"^fetchwarp@[0-9a-f]+$":
115+
type: object
116+
additionalProperties: true
117+
118+
properties:
119+
compatible:
120+
const: fsl,imx8qxp-dc-fetchwarp
121+
122+
"^filter@[0-9a-f]+$":
123+
type: object
124+
additionalProperties: true
125+
126+
properties:
127+
compatible:
128+
const: fsl,imx8qxp-dc-filter
129+
130+
"^hscaler@[0-9a-f]+$":
131+
type: object
132+
additionalProperties: true
133+
134+
properties:
135+
compatible:
136+
const: fsl,imx8qxp-dc-hscaler
137+
138+
"^matrix@[0-9a-f]+$":
139+
type: object
140+
additionalProperties: true
141+
142+
properties:
143+
compatible:
144+
const: fsl,imx8qxp-dc-matrix
145+
146+
"^rop@[0-9a-f]+$":
147+
type: object
148+
additionalProperties: true
149+
150+
properties:
151+
compatible:
152+
const: fsl,imx8qxp-dc-rop
153+
154+
"^store@[0-9a-f]+$":
155+
type: object
156+
additionalProperties: true
157+
158+
properties:
159+
compatible:
160+
const: fsl,imx8qxp-dc-store
161+
162+
"^vscaler@[0-9a-f]+$":
163+
type: object
164+
additionalProperties: true
165+
166+
properties:
167+
compatible:
168+
const: fsl,imx8qxp-dc-vscaler
169+
170+
required:
171+
- compatible
172+
- reg
173+
- reg-names
174+
- "#address-cells"
175+
- "#size-cells"
176+
- ranges
177+
178+
additionalProperties: false
179+
180+
examples:
181+
- |
182+
blit-engine@56180820 {
183+
compatible = "fsl,imx8qxp-dc-blit-engine";
184+
reg = <0x56180820 0x13c>, <0x56181000 0x3400>;
185+
reg-names = "pec", "cfg";
186+
#address-cells = <1>;
187+
#size-cells = <1>;
188+
ranges;
189+
190+
fetchdecode@56180820 {
191+
compatible = "fsl,imx8qxp-dc-fetchdecode";
192+
reg = <0x56180820 0x10>, <0x56181000 0x404>;
193+
reg-names = "pec", "cfg";
194+
};
195+
196+
store@56180940 {
197+
compatible = "fsl,imx8qxp-dc-store";
198+
reg = <0x56180940 0x1c>, <0x56184000 0x5c>;
199+
reg-names = "pec", "cfg";
200+
interrupt-parent = <&dc0_intc>;
201+
interrupts = <0>, <1>, <2>;
202+
interrupt-names = "shdload", "framecomplete", "seqcomplete";
203+
};
204+
};
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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,imx8qxp-dc-blitblend.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX8qxp Display Controller Blit Blend Unit
8+
9+
description:
10+
Combines two input frames to a single output frame, all frames having the
11+
same dimension.
12+
13+
maintainers:
14+
- Liu Ying <[email protected]>
15+
16+
properties:
17+
compatible:
18+
const: fsl,imx8qxp-dc-blitblend
19+
20+
reg:
21+
maxItems: 2
22+
23+
reg-names:
24+
items:
25+
- const: pec
26+
- const: cfg
27+
28+
required:
29+
- compatible
30+
- reg
31+
- reg-names
32+
33+
additionalProperties: false
34+
35+
examples:
36+
- |
37+
blitblend@56180920 {
38+
compatible = "fsl,imx8qxp-dc-blitblend";
39+
reg = <0x56180920 0x10>, <0x56183c00 0x3c>;
40+
reg-names = "pec", "cfg";
41+
};

0 commit comments

Comments
 (0)