Skip to content

Commit 1e26c5e

Browse files
torvaldstorvalds
committed
Merge tag 'media/v6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - platform: synopsys: hdmirx: Fix 64-bit division for 32-bit targets - vim2m: print device name after registering device - Synopsys DesignWare HDMI RX Driver and various fixes - cec/printk fixes and the removal of the vidioc_g/s_ctrl and vidioc_queryctrl callbacks - AVerMedia H789-C PCIe support and rc-core structs padding - Several camera sensor patches - uvcvideo improvements - visl: Fix ERANGE error when setting enum controls - codec fixes - V4L2 camera sensor patches mostly - chips-media: wave5: Fixes - Add SDM670 camera subsystem - Qualcomm iris video decoder driver - dt-bindings: update clocks for sc7280-camss - various fixes and enhancements * tag 'media/v6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (264 commits) media: pci: mgb4: include linux/errno.h media: synopsys: hdmirx: Fix signedness bug in hdmirx_parse_dt() media: platform: synopsys: hdmirx: Fix 64-bit division for 32-bit targets media: vim2m: print device name after registering device media: vivid: Introduce VIDEO_VIVID_OSD media: vivid: Move all fb_info references into vivid-osd media: platform: synopsys: hdmirx: Optimize struct snps_hdmirx_dev media: platform: synopsys: hdmirx: Remove unused HDMI audio CODEC relics media: platform: synopsys: hdmirx: Remove duplicated header inclusion media: qcom: Clean up Kconfig dependencies media: dvb-frontends: tda10048: Make the range of z explicit. media: platform: stm32: Add check for clk_enable() media: xilinx-tpg: fix double put in xtpg_parse_of() media: siano: Fix error handling in smsdvb_module_init() media: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe() media: i2c: tda1997x: Call of_node_put(ep) only once in tda1997x_parse_dt() dt-bindings: media: mediatek,vcodec: Revise description dt-bindings: media: mediatek,jpeg: Relax IOMMU max item count media: v4l2-dv-timings: prevent possible overflow in v4l2_detect_gtf() media: rockchip: rga: fix rga offset lookup ...
2 parents c84907a + f215161 commit 1e26c5e

File tree

281 files changed

+22628
-3414
lines changed

Some content is hidden

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

281 files changed

+22628
-3414
lines changed

‎Documentation/admin-guide/media/cec.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ configure the CEC devices for HDMI Input and the HDMI Outputs manually.
451451
---------------------
452452

453453
A three character manufacturer name that is used in the EDID for the HDMI
454-
Input. If not set, then userspace is reponsible for configuring an EDID.
454+
Input. If not set, then userspace is responsible for configuring an EDID.
455455
If set, then the driver will update the EDID automatically based on the
456456
resolutions supported by the connected displays, and it will not be possible
457457
anymore to manually set the EDID for the HDMI Input.

‎Documentation/admin-guide/media/mgb4.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ Global (PCI card) parameters
2222

2323
| 0 - No module present
2424
| 1 - FPDL3
25-
| 2 - GMSL
25+
| 2 - GMSL (one serializer, two daisy chained deserializers)
26+
| 3 - GMSL (one serializer, two deserializers)
27+
| 4 - GMSL (two deserializers with two daisy chain outputs)
2628
2729
**module_version** (R):
2830
Module version number. Zero in case of a missing module.

‎Documentation/devicetree/bindings/media/aspeed,video-engine.yaml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/aspeed,video-engine.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ASPEED Video Engine
8+
9+
maintainers:
10+
- Eddie James <eajames@linux.ibm.com>
11+
12+
description:
13+
The Video Engine (VE) embedded in the ASPEED SOCs can be configured to
14+
capture and compress video data from digital or analog sources.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- aspeed,ast2400-video-engine
20+
- aspeed,ast2500-video-engine
21+
- aspeed,ast2600-video-engine
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 2
28+
29+
clock-names:
30+
items:
31+
- const: vclk
32+
- const: eclk
33+
34+
resets:
35+
maxItems: 1
36+
37+
interrupts:
38+
maxItems: 1
39+
40+
memory-region:
41+
maxItems: 1
42+
description: |
43+
Phandle to the reserved memory nodes to be associated with the
44+
VE. VE will acquires memory space for 3 purposes:
45+
1. JPEG header
46+
2. Compressed result
47+
3. Temporary transformed image data
48+
49+
required:
50+
- compatible
51+
- reg
52+
- clocks
53+
- clock-names
54+
- interrupts
55+
56+
additionalProperties: false
57+
58+
examples:
59+
- |
60+
#include <dt-bindings/interrupt-controller/arm-gic.h>
61+
#include <dt-bindings/clock/ast2600-clock.h>
62+
63+
video@1e700000 {
64+
compatible = "aspeed,ast2600-video-engine";
65+
reg = <0x1e700000 0x1000>;
66+
clocks = <&syscon ASPEED_CLK_GATE_VCLK>,
67+
<&syscon ASPEED_CLK_GATE_ECLK>;
68+
clock-names = "vclk", "eclk";
69+
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
70+
};

‎Documentation/devicetree/bindings/media/aspeed-video.txt‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎Documentation/devicetree/bindings/media/i2c/adv7180.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ properties:
4949
Indicates that the output is a BT.656-4 compatible stream.
5050
type: boolean
5151

52+
interrupts:
53+
items:
54+
- description: The GPIO connected to the INTRQ pin.
55+
5256
port:
5357
$ref: /schemas/graph.yaml#/$defs/port-base
5458
unevaluatedProperties: false

‎Documentation/devicetree/bindings/media/i2c/st,st-mipid02.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ properties:
7171
description:
7272
Any lane can be inverted or not.
7373
minItems: 1
74-
maxItems: 2
74+
maxItems: 3
7575

7676
required:
7777
- data-lanes

‎Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml‎

Lines changed: 59 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,70 @@
44
$id: http://devicetree.org/schemas/media/mediatek,vcodec-subdev-decoder.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Mediatek Video Decode Accelerator With Multi Hardware
7+
title: MediaTek Video Decode Accelerator With Multi Hardware
88

99
maintainers:
1010
- Yunfei Dong <yunfei.dong@mediatek.com>
1111

1212
description: |
13-
Mediatek Video Decode is the video decode hardware present in Mediatek
14-
SoCs which supports high resolution decoding functionalities. Required
15-
parent and child device node.
16-
17-
About the Decoder Hardware Block Diagram, please check below:
18-
19-
+------------------------------------------------+-------------------------------------+
20-
| | |
21-
| input -> lat soc HW -> lat HW -> lat buffer --|--> lat buffer -> core HW -> output |
22-
| || || | || |
23-
+------------||-------------||-------------------+---------------------||--------------+
24-
|| lat || | core workqueue <parent>
25-
-------------||-------------||-------------------|---------------------||---------------
26-
||<------------||----------------HW index---------------->|| <child>
27-
\/ \/ \/
28-
+-------------------------------------------------------------+
29-
| enable/disable |
30-
| clk power irq iommu |
31-
| (lat/lat soc/core0/core1) |
32-
+-------------------------------------------------------------+
33-
34-
As above, there are parent and child devices, child mean each hardware. The child device
35-
controls the information of each hardware independent which include clk/power/irq.
36-
37-
There are two workqueues in parent device: lat workqueue and core workqueue. They are used
38-
to lat and core hardware decoder. Lat workqueue need to get input bitstream and lat buffer,
39-
then enable lat to decode, writing the result to lat buffer, dislabe hardware when lat decode
40-
done. Core workqueue need to get lat buffer and output buffer, then enable core to decode,
41-
writing the result to output buffer, disable hardware when core decode done. These two
42-
hardwares will decode each frame cyclically.
43-
44-
For the smi common may not the same for each hardware, can't combine all hardware in one node,
45-
or leading to iommu fault when access dram data.
46-
47-
Lat soc is a hardware which is related with some larb(local arbiter) ports. For mt8195
48-
platform, there are some ports like RDMA, UFO in lat soc larb, need to enable its power and
49-
clock when lat start to work, don't have interrupt.
50-
51-
mt8195: lat soc HW + lat HW + core HW
52-
mt8192: lat HW + core HW
13+
MediaTek Video Decode Accelerator is the video decoding hardware present in
14+
MediaTek SoCs that supports high-resolution decoding functionalities.
15+
It consists of parent and child nodes.
16+
17+
The decoder hardware block diagram is shown below:
18+
19+
+------------------------------------------------+------------------------------+
20+
| | |
21+
| input -> LAT-SoC HW -> LAT HW -> LAT buffer --|--> Core HW -> output buffer |
22+
| || || | || |
23+
+--------------||-----------||-------------------+-------||---------------------+
24+
LAT Workqueue | Core Workqueue <parent>
25+
---------------||-----------||-------------------|-------||----------------------
26+
||<----------||---------HW index--------->|| <child>
27+
\/ \/ \/
28+
+-------------------------------------------------------------+
29+
| enable/disable |
30+
| clk power irq iommu |
31+
| (lat/lat-soc/core0/core1) |
32+
+-------------------------------------------------------------+
33+
34+
The child nodes represent the individual hardware blocks within the decoding
35+
pipeline, such as LAT-SoC, LAT and Core.
36+
Each child node is responsible for managing the dedicated resources of the
37+
hardware, such as clocks, power domains, interrupts and IOMMUs.
38+
39+
The parent node is a central point of control for the child nodes.
40+
It identifies the specific video decoding pipeline architecture used by the
41+
SoC, manages the shared resources like workqueues and platform data, and
42+
handles V4L2 API calls on behalf of the underlying hardware.
43+
44+
The parent utilizes two workqueues to manage the decoding process.
45+
1. LAT Workqueue, for LAT-SoC and LAT decoder:
46+
Its workers take input bitstream and LAT buffer, enable the hardware for
47+
decoding tasks, write the result to LAT buffer, and disable the hardware
48+
after the LAT decoding is done.
49+
2. Core Workqueue, for Core decoder:
50+
Its workers take LAT buffer and output buffer, enable the hardware for
51+
decoding tasks, write the result to output buffer, and disable the hardware
52+
after the Core decoding is done.
53+
54+
These hardware decode each frame cyclically.
55+
56+
The hardware might be associated with different SMI-common devices.
57+
To prevent IOMMU faults during DRAM access in such cases, each hardware with
58+
the unique SMI-common device must be placed under a separate parent node in
59+
the device tree.
60+
61+
LAT-SoC refers to another hardware block that connected to additional LARB
62+
(local arbiter) ports, such as RDMA and UFO.
63+
It requires independent power and clock control to work with LAT decoder, and
64+
it doesn't have a dedicated interrupt.
65+
66+
The used video decoding pipeline architecture across various Mediatek SoC:
67+
MT8195: LAT-SoC + LAT + Core
68+
MT8192: LAT + Core
69+
MT8188: LAT + Core
70+
MT8186: Core
5371
5472
properties:
5573
compatible:

‎Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ properties:
4444
maxItems: 1
4545

4646
iommus:
47-
maxItems: 2
47+
minItems: 2
48+
maxItems: 32
4849
description: |
4950
Points to the respective IOMMU block with master port as argument, see
5051
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.

‎Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ properties:
3939

4040
iommus:
4141
minItems: 2
42-
maxItems: 4
42+
maxItems: 32
4343
description: |
4444
Points to the respective IOMMU block with master port as argument, see
4545
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details.

‎Documentation/devicetree/bindings/media/qcom,sc7280-camss.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ properties:
5555
- const: csiphy3_timer
5656
- const: csiphy4
5757
- const: csiphy4_timer
58-
- const: gcc_camera_ahb
59-
- const: gcc_cam_hf_axi
58+
- const: gcc_axi_hf
59+
- const: gcc_axi_sf
6060
- const: icp_ahb
6161
- const: vfe0
6262
- const: vfe0_axi
@@ -310,8 +310,8 @@ examples:
310310
<&camcc CAM_CC_CSI3PHYTIMER_CLK>,
311311
<&camcc CAM_CC_CSIPHY4_CLK>,
312312
<&camcc CAM_CC_CSI4PHYTIMER_CLK>,
313-
<&gcc GCC_CAMERA_AHB_CLK>,
314313
<&gcc GCC_CAMERA_HF_AXI_CLK>,
314+
<&gcc GCC_CAMERA_SF_AXI_CLK>,
315315
<&camcc CAM_CC_ICP_AHB_CLK>,
316316
<&camcc CAM_CC_IFE_0_CLK>,
317317
<&camcc CAM_CC_IFE_0_AXI_CLK>,
@@ -343,8 +343,8 @@ examples:
343343
"csiphy3_timer",
344344
"csiphy4",
345345
"csiphy4_timer",
346-
"gcc_camera_ahb",
347-
"gcc_cam_hf_axi",
346+
"gcc_axi_hf",
347+
"gcc_axi_sf",
348348
"icp_ahb",
349349
"vfe0",
350350
"vfe0_axi",

0 commit comments

Comments
 (0)