* [PATCH 1/5] dt-bindings: media: venus,common: Extend clocks and power domains
2026-09-14 13:00 [PATCH 0/5] media: iris: add support for maili platform Wangao Wang
@ 2026-09-14 13:00 ` Wangao Wang
2026-09-15 7:16 ` Krzysztof Kozlowski
2026-09-14 13:00 ` [PATCH 2/5] dt-bindings: media: qcom,maili-iris: Add maili video codec binding Wangao Wang
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Wangao Wang @ 2026-09-14 13:00 UTC (permalink / raw)
To: Bryan O'Donoghue, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy
Cc: linux-media, linux-arm-msm, devicetree, linux-kernel, Wangao Wang
Upcoming SoC platforms require more clocks, power domain entries, and
IOMMU mappings than the current limits allow. Relax the common schema
constraints to accommodate these platforms:
- clocks/clock-names: increase maxItems from 7 to 8
- power-domains/power-domain-names: increase maxItems from 4 to 5
- non-pixel context bank: add minItems and increase iommus maxItems to 3
Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
---
.../devicetree/bindings/media/qcom,venus-common.yaml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/qcom,venus-common.yaml b/Documentation/devicetree/bindings/media/qcom,venus-common.yaml
index 68d5e592a028c5eecde04ce72cd5ae6815ba5c82..795ecca21bd6bd05b5e0dd610c749857d22ad1cb 100644
--- a/Documentation/devicetree/bindings/media/qcom,venus-common.yaml
+++ b/Documentation/devicetree/bindings/media/qcom,venus-common.yaml
@@ -20,11 +20,11 @@ properties:
clocks:
minItems: 3
- maxItems: 7
+ maxItems: 8
clock-names:
minItems: 3
- maxItems: 7
+ maxItems: 8
firmware-name:
maxItems: 1
@@ -41,11 +41,11 @@ properties:
power-domains:
minItems: 1
- maxItems: 4
+ maxItems: 5
power-domain-names:
minItems: 1
- maxItems: 4
+ maxItems: 5
'#address-cells':
const: 1
@@ -64,9 +64,10 @@ properties:
properties:
iommus:
- maxItems: 1
+ minItems: 1
+ maxItems: 3
iommu-ranges:
- maxItems: 1
+ maxItems: 2
required:
- iommus
- iommu-ranges
--
2.43.0
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/5] dt-bindings: media: venus,common: Extend clocks and power domains
2026-09-14 13:00 ` [PATCH 1/5] dt-bindings: media: venus,common: Extend clocks and power domains Wangao Wang
@ 2026-09-15 7:16 ` Krzysztof Kozlowski
0 siblings, 0 replies; 11+ messages in thread
From: Krzysztof Kozlowski @ 2026-09-15 7:16 UTC (permalink / raw)
To: Wangao Wang
Cc: Bryan O'Donoghue, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy, linux-media, linux-arm-msm, devicetree,
linux-kernel
On Mon, Sep 14, 2026 at 09:00:24PM +0800, Wangao Wang wrote:
> Upcoming SoC platforms require more clocks, power domain entries, and
> IOMMU mappings than the current limits allow. Relax the common schema
> constraints to accommodate these platforms:
>
> - clocks/clock-names: increase maxItems from 7 to 8
> - power-domains/power-domain-names: increase maxItems from 4 to 5
> - non-pixel context bank: add minItems and increase iommus maxItems to 3
Don't repeat the diff.
>
> Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
> ---
> .../devicetree/bindings/media/qcom,venus-common.yaml | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
This makes no sense on its own. There is no user of this bigger
constraints for clocks.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/5] dt-bindings: media: qcom,maili-iris: Add maili video codec binding
2026-09-14 13:00 [PATCH 0/5] media: iris: add support for maili platform Wangao Wang
2026-09-14 13:00 ` [PATCH 1/5] dt-bindings: media: venus,common: Extend clocks and power domains Wangao Wang
@ 2026-09-14 13:00 ` Wangao Wang
2026-09-15 7:33 ` Krzysztof Kozlowski
2026-09-14 13:00 ` [PATCH 3/5] media: iris: add AV1 decode buffer size support for vpu4x Wangao Wang
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Wangao Wang @ 2026-09-14 13:00 UTC (permalink / raw)
To: Bryan O'Donoghue, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy
Cc: linux-media, linux-arm-msm, devicetree, linux-kernel, Wangao Wang
Add a devicetree binding for the Iris4 video encoder and decoder block
found on the Qualcomm Maili SoC.
Compared to the Iris3 generation, this block has
- separate power domains for stream and pixel processing hardware blocks
(bse and vpp).
- different clocks and reset lines.
Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
---
.../devicetree/bindings/media/qcom,maili-iris.yaml | 235 +++++++++++++++++++++
1 file changed, 235 insertions(+)
diff --git a/Documentation/devicetree/bindings/media/qcom,maili-iris.yaml b/Documentation/devicetree/bindings/media/qcom,maili-iris.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..58d241999824f3cdc85a1d644200be1e4916e324
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/qcom,maili-iris.yaml
@@ -0,0 +1,235 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/qcom,maili-iris.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Maili SoC Iris video encoder and decoder
+
+maintainers:
+ - Vikash Garodia <vikash.garodia@oss.qualcomm.com>
+ - Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
+
+description:
+ The Iris video processing unit on Qualcomm Maili SoC is a video encode and
+ decode accelerator.
+
+properties:
+ compatible:
+ enum:
+ - qcom,maili-iris
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 8
+
+ clock-names:
+ items:
+ - const: iface
+ - const: core
+ - const: vcodec0_core
+ - const: iface1
+ - const: core_freerun
+ - const: vcodec0_core_freerun
+ - const: vcodec_bse
+ - const: vcodec_vpp0
+
+ firmware-name:
+ maxItems: 1
+
+ interconnects:
+ maxItems: 2
+
+ interconnect-names:
+ items:
+ - const: cpu-cfg
+ - const: video-mem
+
+ power-domains:
+ maxItems: 5
+
+ power-domain-names:
+ items:
+ - const: venus
+ - const: vcodec0
+ - const: mxc
+ - const: mmcx
+ - const: vpp0
+
+ resets:
+ maxItems: 4
+
+ reset-names:
+ items:
+ - const: bus0
+ - const: bus1
+ - const: core
+ - const: vcodec0_core
+
+ iommus:
+ maxItems: 4
+
+ dma-coherent: true
+
+ memory-region:
+ minItems: 1
+ items:
+ - description: Firmware-loaded codec carveout
+ - description: IOMMU IOVA reservation region
+
+ operating-points-v2: true
+
+ opp-table:
+ type: object
+
+required:
+ - compatible
+ - dma-coherent
+ - interconnects
+ - interconnect-names
+ - power-domain-names
+ - resets
+ - reset-names
+
+allOf:
+ - $ref: qcom,venus-common.yaml#
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/qcom,hawi-gcc.h>
+ #include <dt-bindings/clock/qcom,maili-videocc.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/interconnect/qcom,icc.h>
+ #include <dt-bindings/interconnect/qcom,maili-rpmh.h>
+ #include <dt-bindings/power/qcom,rpmhpd.h>
+
+ video-codec@2000000 {
+ compatible = "qcom,maili-iris";
+ reg = <0x02000000 0xf0000>;
+
+ interrupts = <GIC_ESPI 238 IRQ_TYPE_LEVEL_HIGH>;
+
+ clocks = <&gcc GCC_VIDEO_AXI0_CLK>,
+ <&videocc VIDEO_CC_MVS0C_CLK>,
+ <&videocc VIDEO_CC_MVS0_CLK>,
+ <&gcc GCC_VIDEO_AXI0C_CLK>,
+ <&videocc VIDEO_CC_MVS0C_FREERUN_CLK>,
+ <&videocc VIDEO_CC_MVS0_FREERUN_CLK>,
+ <&videocc VIDEO_CC_MVS0B_CLK>,
+ <&videocc VIDEO_CC_MVS0_VPP0_CLK>;
+ clock-names = "iface",
+ "core",
+ "vcodec0_core",
+ "iface1",
+ "core_freerun",
+ "vcodec0_core_freerun",
+ "vcodec_bse",
+ "vcodec_vpp0";
+
+ dma-coherent;
+
+ interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+ &config_noc SLAVE_IRIS_CFG QCOM_ICC_TAG_ACTIVE_ONLY>,
+ <&mmss_noc MASTER_VIDEO_MVP QCOM_ICC_TAG_ALWAYS
+ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+ interconnect-names = "cpu-cfg",
+ "video-mem";
+
+ memory-region = <&video_mem>;
+
+ power-domains = <&videocc VIDEO_CC_MVS0C_GDSC>,
+ <&videocc VIDEO_CC_MVS0_GDSC>,
+ <&rpmhpd RPMHPD_MXC>,
+ <&rpmhpd RPMHPD_MMCX>,
+ <&videocc VIDEO_CC_MVS0_VPP0_GDSC>;
+ power-domain-names = "venus",
+ "vcodec0",
+ "mxc",
+ "mmcx",
+ "vpp0";
+
+ resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>,
+ <&gcc GCC_VIDEO_AXI0C_CLK_ARES>,
+ <&videocc VIDEO_CC_MVS0C_FREERUN_CLK_ARES>,
+ <&videocc VIDEO_CC_MVS0_FREERUN_CLK_ARES>;
+ reset-names = "bus0",
+ "bus1",
+ "core",
+ "vcodec0_core";
+
+ operating-points-v2 = <&iris_opp_table>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ dma-ranges = <0x0 0x0 0xffc00000>;
+
+ non-pixel {
+ iommus = <&apps_smmu 0x1540 0x0000>,
+ <&apps_smmu 0x1620 0x0000>,
+ <&apps_smmu 0x1544 0x0000>;
+ iommu-ranges = <0x25800000 0xda400000>;
+ };
+
+ pixel {
+ iommus = <&apps_smmu 0x1543 0x0000>;
+ };
+
+ iris_opp_table: opp-table {
+ compatible = "operating-points-v2";
+
+ opp-240000000 {
+ opp-hz = /bits/ 64 <240000000 240000000 360000000>;
+ required-opps = <&rpmhpd_opp_low_svs_d2>,
+ <&rpmhpd_opp_low_svs_d1>;
+ };
+
+ opp-338000000 {
+ opp-hz = /bits/ 64 <338000000 338000000 507000000>;
+ required-opps = <&rpmhpd_opp_low_svs_d1>,
+ <&rpmhpd_opp_low_svs>;
+ };
+
+ opp-420000000 {
+ opp-hz = /bits/ 64 <420000000 420000000 630000000>;
+ required-opps = <&rpmhpd_opp_svs>,
+ <&rpmhpd_opp_svs>;
+ };
+
+ opp-444000000 {
+ opp-hz = /bits/ 64 <444000000 444000000 666000000>;
+ required-opps = <&rpmhpd_opp_svs>,
+ <&rpmhpd_opp_svs_l1>;
+ };
+
+ opp-600000000 {
+ opp-hz = /bits/ 64 <600000000 533000000 800000000>;
+ required-opps = <&rpmhpd_opp_svs_l1>,
+ <&rpmhpd_opp_nom>;
+ };
+
+ opp-630000000 {
+ opp-hz = /bits/ 64 <630000000 630000000 1104000000>;
+ required-opps = <&rpmhpd_opp_svs_l1>,
+ <&rpmhpd_opp_turbo>;
+ };
+
+ opp-800000000 {
+ opp-hz = /bits/ 64 <800000000 630000000 1260000000>;
+ required-opps = <&rpmhpd_opp_svs_l1>,
+ <&rpmhpd_opp_turbo_l1>;
+ };
+
+ opp-1000000000 {
+ opp-hz = /bits/ 64 <1000000000 800000000 1260000000>;
+ required-opps = <&rpmhpd_opp_nom>,
+ <&rpmhpd_opp_turbo_l3>;
+ };
+ };
+ };
--
2.43.0
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/5] dt-bindings: media: qcom,maili-iris: Add maili video codec binding
2026-09-14 13:00 ` [PATCH 2/5] dt-bindings: media: qcom,maili-iris: Add maili video codec binding Wangao Wang
@ 2026-09-15 7:33 ` Krzysztof Kozlowski
0 siblings, 0 replies; 11+ messages in thread
From: Krzysztof Kozlowski @ 2026-09-15 7:33 UTC (permalink / raw)
To: Wangao Wang
Cc: Bryan O'Donoghue, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy, linux-media, linux-arm-msm, devicetree,
linux-kernel
On Mon, Sep 14, 2026 at 09:00:25PM +0800, Wangao Wang wrote:
> +
> +maintainers:
> + - Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> + - Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
> +
A nit, subject: drop second/last, redundant "binding". The
"dt-bindings" prefix is already stating that these are bindings.
See also:
https://elixir.bootlin.com/linux/v7.1-rc7/source/Documentation/devicetree/bindings/submitting-patches.rst#L23
> +description:
> + The Iris video processing unit on Qualcomm Maili SoC is a video encode and
> + decode accelerator.
> +
> +properties:
> + compatible:
> + enum:
> + - qcom,maili-iris
> +
> + reg:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 8
> +
> + clock-names:
> + items:
> + - const: iface
> + - const: core
> + - const: vcodec0_core
> + - const: iface1
> + - const: core_freerun
> + - const: vcodec0_core_freerun
> + - const: vcodec_bse
bse? What does vcodec stand for? Isn't Iris a vcodec?
> + - const: vcodec_vpp0
cpp?
> +
> + firmware-name:
> + maxItems: 1
> +
> + interconnects:
> + maxItems: 2
> +
> + interconnect-names:
> + items:
> + - const: cpu-cfg
> + - const: video-mem
> +
> + power-domains:
> + maxItems: 5
> +
> + power-domain-names:
> + items:
> + - const: venus
> + - const: vcodec0
> + - const: mxc
> + - const: mmcx
> + - const: vpp0
> +
> + resets:
> + maxItems: 4
> +
> + reset-names:
> + items:
> + - const: bus0
> + - const: bus1
> + - const: core
> + - const: vcodec0_core
> +
> + iommus:
> + maxItems: 4
> +
> + dma-coherent: true
> +
> + memory-region:
> + minItems: 1
Why is this flexible?
> + items:
> + - description: Firmware-loaded codec carveout
> + - description: IOMMU IOVA reservation region
> +
> + operating-points-v2: true
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/5] media: iris: add AV1 decode buffer size support for vpu4x
2026-09-14 13:00 [PATCH 0/5] media: iris: add support for maili platform Wangao Wang
2026-09-14 13:00 ` [PATCH 1/5] dt-bindings: media: venus,common: Extend clocks and power domains Wangao Wang
2026-09-14 13:00 ` [PATCH 2/5] dt-bindings: media: qcom,maili-iris: Add maili video codec binding Wangao Wang
@ 2026-09-14 13:00 ` Wangao Wang
2026-09-14 19:42 ` Bryan O'Donoghue
2026-09-14 13:00 ` [PATCH 4/5] media: iris: fix VPU4x encoder line buffer size calculations Wangao Wang
2026-09-14 13:00 ` [PATCH 5/5] media: iris: add maili platform data Wangao Wang
4 siblings, 1 reply; 11+ messages in thread
From: Wangao Wang @ 2026-09-14 13:00 UTC (permalink / raw)
To: Bryan O'Donoghue, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy
Cc: linux-media, linux-arm-msm, devicetree, linux-kernel, Wangao Wang
Add necessary buffer size calculation to support AV1 decode for vpu4x
- wire AV1 into iris_vpu4x_dec_line_size() via hfi_buffer_line_av1d()
- add hfi_vpu4x_buffer_persist_av1d() for the vpu4x's persist buffer
size calculation
- add BUF_PARTIAL to the vpu4x decoder dispatch table, which AV1D
requires
Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 35 ++++++++++++++++++++--
drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 1 +
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
index faebb54728660cc621f8822dabf2e44ce8c55c58..55996fd0d14c385ee63d2577b3e6d71b51d9e541 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
@@ -1833,6 +1833,8 @@ static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst)
else if (inst->codec == V4L2_PIX_FMT_VP9)
return hfi_vpu4x_buffer_line_vp9d(width, height, out_min_count, is_opb,
num_vpp_pipes);
+ else if (inst->codec == V4L2_PIX_FMT_AV1)
+ return hfi_buffer_line_av1d(width, height, is_opb, num_vpp_pipes);
return 0;
}
@@ -1856,14 +1858,40 @@ static u32 hfi_vpu4x_buffer_persist_vp9d(void)
HDR10_HIST_EXTRADATA_SIZE;
}
+static u32 hfi_vpu4x_buffer_persist_av1d(u32 max_width, u32 max_height,
+ u32 total_ref_count, u32 rpu_enabled)
+{
+ u32 comv_size, size;
+
+ comv_size = hfi_buffer_comv_av1d(max_width, max_height, total_ref_count);
+ size = (SIZE_AV1D_SEQUENCE_HEADER * 2 + SIZE_AV1D_METADATA +
+ AV1D_NUM_HW_PIC_BUF * (SIZE_AV1D_TILE_OFFSET + SIZE_AV1D_QM + SIZE_AV1D_ARP) +
+ AV1D_NUM_FRAME_HEADERS * (SIZE_AV1D_FRAME_HEADER +
+ 2 * SIZE_AV1D_PROB_TABLE) + comv_size + HDR10_HIST_EXTRADATA_SIZE +
+ SIZE_AV1D_METADATA * AV1D_NUM_HW_PIC_BUF) +
+ rpu_enabled * NUM_HW_PIC_BUF * SIZE_DOLBY_RPU_METADATA;
+
+ return ALIGN(size, DMA_ALIGNMENT);
+}
+
static u32 iris_vpu4x_dec_persist_size(struct iris_inst *inst)
{
- if (inst->codec == V4L2_PIX_FMT_H264)
+ struct platform_inst_caps *caps;
+
+ if (inst->codec == V4L2_PIX_FMT_H264) {
return hfi_buffer_persist_h264d();
- else if (inst->codec == V4L2_PIX_FMT_HEVC)
+ } else if (inst->codec == V4L2_PIX_FMT_HEVC) {
return hfi_vpu4x_buffer_persist_h265d(0);
- else if (inst->codec == V4L2_PIX_FMT_VP9)
+ } else if (inst->codec == V4L2_PIX_FMT_VP9) {
return hfi_vpu4x_buffer_persist_vp9d();
+ } else if (inst->codec == V4L2_PIX_FMT_AV1) {
+ caps = inst->core->iris_platform_data->inst_caps;
+ if (inst->fw_caps[DRAP].value)
+ return hfi_vpu4x_buffer_persist_av1d(caps->max_frame_width,
+ caps->max_frame_height, 16, 0);
+ else
+ return hfi_vpu4x_buffer_persist_av1d(0, 0, 0, 0);
+ }
return 0;
}
@@ -2163,6 +2191,7 @@ u32 iris_vpu4x_buf_size(struct iris_inst *inst, enum iris_buffer_type buffer_typ
{BUF_PERSIST, iris_vpu4x_dec_persist_size },
{BUF_DPB, iris_vpu_dec_dpb_size },
{BUF_SCRATCH_1, iris_vpu_dec_scratch1_size },
+ {BUF_PARTIAL, iris_vpu_dec_partial_size },
};
static const struct iris_vpu_buf_type_handle enc_internal_buf_type_handle[] = {
diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
index 8c0d6b7b5de85f7d7aaa8fc36218e8d095419569..c7020931a642f0484b6f84af7ab51242e1845458 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
+++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
@@ -116,6 +116,7 @@ struct iris_inst;
#define SIZE_AV1D_TILE_OFFSET 65536
#define SIZE_AV1D_QM 3328
#define SIZE_AV1D_PROB_TABLE 22784
+#define SIZE_AV1D_ARP 9728
#define SIZE_SLICE_CMD_BUFFER (ALIGN(20480, 256))
#define SIZE_SPS_PPS_SLICE_HDR (2048 + 4096)
--
2.43.0
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 3/5] media: iris: add AV1 decode buffer size support for vpu4x
2026-09-14 13:00 ` [PATCH 3/5] media: iris: add AV1 decode buffer size support for vpu4x Wangao Wang
@ 2026-09-14 19:42 ` Bryan O'Donoghue
2026-09-16 0:40 ` Deepa Guthyappa Madivalara
0 siblings, 1 reply; 11+ messages in thread
From: Bryan O'Donoghue @ 2026-09-14 19:42 UTC (permalink / raw)
To: Wangao Wang, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy
Cc: linux-media, linux-arm-msm, devicetree, linux-kernel
On 14/09/2026 14:00, Wangao Wang wrote:
> Add necessary buffer size calculation to support AV1 decode for vpu4x
>
> - wire AV1 into iris_vpu4x_dec_line_size() via hfi_buffer_line_av1d()
> - add hfi_vpu4x_buffer_persist_av1d() for the vpu4x's persist buffer
> size calculation
> - add BUF_PARTIAL to the vpu4x decoder dispatch table, which AV1D
> requires
>
> Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 35 ++++++++++++++++++++--
> drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 1 +
> 2 files changed, 33 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> index faebb54728660cc621f8822dabf2e44ce8c55c58..55996fd0d14c385ee63d2577b3e6d71b51d9e541 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> @@ -1833,6 +1833,8 @@ static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst)
> else if (inst->codec == V4L2_PIX_FMT_VP9)
> return hfi_vpu4x_buffer_line_vp9d(width, height, out_min_count, is_opb,
> num_vpp_pipes);
> + else if (inst->codec == V4L2_PIX_FMT_AV1)
> + return hfi_buffer_line_av1d(width, height, is_opb, num_vpp_pipes);
>
> return 0;
> }
> @@ -1856,14 +1858,40 @@ static u32 hfi_vpu4x_buffer_persist_vp9d(void)
> HDR10_HIST_EXTRADATA_SIZE;
> }
>
> +static u32 hfi_vpu4x_buffer_persist_av1d(u32 max_width, u32 max_height,
> + u32 total_ref_count, u32 rpu_enabled)
> +{
> + u32 comv_size, size;
> +
> + comv_size = hfi_buffer_comv_av1d(max_width, max_height, total_ref_count);
> + size = (SIZE_AV1D_SEQUENCE_HEADER * 2 + SIZE_AV1D_METADATA +
> + AV1D_NUM_HW_PIC_BUF * (SIZE_AV1D_TILE_OFFSET + SIZE_AV1D_QM + SIZE_AV1D_ARP) +
> + AV1D_NUM_FRAME_HEADERS * (SIZE_AV1D_FRAME_HEADER +
> + 2 * SIZE_AV1D_PROB_TABLE) + comv_size + HDR10_HIST_EXTRADATA_SIZE +
> + SIZE_AV1D_METADATA * AV1D_NUM_HW_PIC_BUF) +
> + rpu_enabled * NUM_HW_PIC_BUF * SIZE_DOLBY_RPU_METADATA;
Ah come on.
A routine, a macro can't accept something like that. You have two
variables and a ton of constants.
Plus the logic that gives you this clause may make sense to you but, I
don't see how.
For some of these defines - it looks like they pertain to headers,
footers, offsets etc they can be reduced down to some sort of packet
header type thing.
I've asked for this type of reduction of clause complexity before.
Please take heed.
> +
> + return ALIGN(size, DMA_ALIGNMENT);
> +}
> +
> static u32 iris_vpu4x_dec_persist_size(struct iris_inst *inst)
> {
> - if (inst->codec == V4L2_PIX_FMT_H264)
> + struct platform_inst_caps *caps;
> +
> + if (inst->codec == V4L2_PIX_FMT_H264) {
> return hfi_buffer_persist_h264d();
> - else if (inst->codec == V4L2_PIX_FMT_HEVC)
> + } else if (inst->codec == V4L2_PIX_FMT_HEVC) {
> return hfi_vpu4x_buffer_persist_h265d(0);
> - else if (inst->codec == V4L2_PIX_FMT_VP9)
> + } else if (inst->codec == V4L2_PIX_FMT_VP9) {
> return hfi_vpu4x_buffer_persist_vp9d();
> + } else if (inst->codec == V4L2_PIX_FMT_AV1) {
> + caps = inst->core->iris_platform_data->inst_caps;
> + if (inst->fw_caps[DRAP].value)
> + return hfi_vpu4x_buffer_persist_av1d(caps->max_frame_width,
> + caps->max_frame_height, 16, 0);
> + else
> + return hfi_vpu4x_buffer_persist_av1d(0, 0, 0, 0);
> + }
>
> return 0;
> }
> @@ -2163,6 +2191,7 @@ u32 iris_vpu4x_buf_size(struct iris_inst *inst, enum iris_buffer_type buffer_typ
> {BUF_PERSIST, iris_vpu4x_dec_persist_size },
> {BUF_DPB, iris_vpu_dec_dpb_size },
> {BUF_SCRATCH_1, iris_vpu_dec_scratch1_size },
> + {BUF_PARTIAL, iris_vpu_dec_partial_size },
> };
>
> static const struct iris_vpu_buf_type_handle enc_internal_buf_type_handle[] = {
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> index 8c0d6b7b5de85f7d7aaa8fc36218e8d095419569..c7020931a642f0484b6f84af7ab51242e1845458 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> @@ -116,6 +116,7 @@ struct iris_inst;
> #define SIZE_AV1D_TILE_OFFSET 65536
> #define SIZE_AV1D_QM 3328
> #define SIZE_AV1D_PROB_TABLE 22784
> +#define SIZE_AV1D_ARP 9728
>
> #define SIZE_SLICE_CMD_BUFFER (ALIGN(20480, 256))
> #define SIZE_SPS_PPS_SLICE_HDR (2048 + 4096)
>
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 3/5] media: iris: add AV1 decode buffer size support for vpu4x
2026-09-14 19:42 ` Bryan O'Donoghue
@ 2026-09-16 0:40 ` Deepa Guthyappa Madivalara
0 siblings, 0 replies; 11+ messages in thread
From: Deepa Guthyappa Madivalara @ 2026-09-16 0:40 UTC (permalink / raw)
To: Bryan O'Donoghue, Wangao Wang, Vikash Garodia,
Dikshita Agarwal, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Stanimir Varbanov,
Abhinav Kumar, Hans Verkuil, Vishnu Reddy
Cc: linux-media, linux-arm-msm, devicetree, linux-kernel
On 9/14/2026 12:42 PM, Bryan O'Donoghue wrote:
> On 14/09/2026 14:00, Wangao Wang wrote:
>> Add necessary buffer size calculation to support AV1 decode for vpu4x
>>
>> - wire AV1 into iris_vpu4x_dec_line_size() via hfi_buffer_line_av1d()
>> - add hfi_vpu4x_buffer_persist_av1d() for the vpu4x's persist buffer
>> size calculation
>> - add BUF_PARTIAL to the vpu4x decoder dispatch table, which AV1D
>> requires
>>
>> Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
>> ---
>> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 35
>> ++++++++++++++++++++--
>> drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 1 +
>> 2 files changed, 33 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
>> b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
>> index
>> faebb54728660cc621f8822dabf2e44ce8c55c58..55996fd0d14c385ee63d2577b3e6d71b51d9e541
>> 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
>> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
>> @@ -1833,6 +1833,8 @@ static u32 iris_vpu4x_dec_line_size(struct
>> iris_inst *inst)
>> else if (inst->codec == V4L2_PIX_FMT_VP9)
>> return hfi_vpu4x_buffer_line_vp9d(width, height,
>> out_min_count, is_opb,
>> num_vpp_pipes);
>> + else if (inst->codec == V4L2_PIX_FMT_AV1)
>> + return hfi_buffer_line_av1d(width, height, is_opb,
>> num_vpp_pipes);
>>
This needs to be updated to hfi_vpu4x_buffer_line_av1d - The line buffer
calculation differs for iris4 av1d
and is lut based. Without it firmware session error should be seen.
>> return 0;
>> }
>> @@ -1856,14 +1858,40 @@ static u32 hfi_vpu4x_buffer_persist_vp9d(void)
>> HDR10_HIST_EXTRADATA_SIZE;
>> }
>>
>> +static u32 hfi_vpu4x_buffer_persist_av1d(u32 max_width, u32 max_height,
>> + u32 total_ref_count, u32 rpu_enabled)
>> +{
>> + u32 comv_size, size;
>> +
>> + comv_size = hfi_buffer_comv_av1d(max_width, max_height,
>> total_ref_count);
>
>> + size = (SIZE_AV1D_SEQUENCE_HEADER * 2 + SIZE_AV1D_METADATA +
>> + AV1D_NUM_HW_PIC_BUF * (SIZE_AV1D_TILE_OFFSET + SIZE_AV1D_QM +
>> SIZE_AV1D_ARP) +
>> + AV1D_NUM_FRAME_HEADERS * (SIZE_AV1D_FRAME_HEADER +
>> + 2 * SIZE_AV1D_PROB_TABLE) + comv_size + HDR10_HIST_EXTRADATA_SIZE +
>> + SIZE_AV1D_METADATA * AV1D_NUM_HW_PIC_BUF) +
>> + rpu_enabled * NUM_HW_PIC_BUF * SIZE_DOLBY_RPU_METADATA;
>
> Ah come on.
>
> A routine, a macro can't accept something like that. You have two
> variables and a ton of constants.
>
> Plus the logic that gives you this clause may make sense to you but, I
> don't see how.
>
> For some of these defines - it looks like they pertain to headers,
> footers, offsets etc they can be reduced down to some sort of packet
> header type thing.
>
> I've asked for this type of reduction of clause complexity before.
>
> Please take heed.
>
>> +
>> + return ALIGN(size, DMA_ALIGNMENT);
>> +}
>> +
>> static u32 iris_vpu4x_dec_persist_size(struct iris_inst *inst)
>> {
>> - if (inst->codec == V4L2_PIX_FMT_H264)
>> + struct platform_inst_caps *caps;
>> +
>> + if (inst->codec == V4L2_PIX_FMT_H264) {
>> return hfi_buffer_persist_h264d();
>> - else if (inst->codec == V4L2_PIX_FMT_HEVC)
>> + } else if (inst->codec == V4L2_PIX_FMT_HEVC) {
>> return hfi_vpu4x_buffer_persist_h265d(0);
>> - else if (inst->codec == V4L2_PIX_FMT_VP9)
>> + } else if (inst->codec == V4L2_PIX_FMT_VP9) {
>> return hfi_vpu4x_buffer_persist_vp9d();
>> + } else if (inst->codec == V4L2_PIX_FMT_AV1) {
>> + caps = inst->core->iris_platform_data->inst_caps;
>> + if (inst->fw_caps[DRAP].value)
>> + return hfi_vpu4x_buffer_persist_av1d(caps->max_frame_width,
>> + caps->max_frame_height, 16, 0);
>> + else
>> + return hfi_vpu4x_buffer_persist_av1d(0, 0, 0, 0);
>> + }
>>
>> return 0;
>> }
>> @@ -2163,6 +2191,7 @@ u32 iris_vpu4x_buf_size(struct iris_inst *inst,
>> enum iris_buffer_type buffer_typ
>> {BUF_PERSIST, iris_vpu4x_dec_persist_size },
>> {BUF_DPB, iris_vpu_dec_dpb_size },
>> {BUF_SCRATCH_1, iris_vpu_dec_scratch1_size },
>> + {BUF_PARTIAL, iris_vpu_dec_partial_size },
>> };
>>
>> static const struct iris_vpu_buf_type_handle
>> enc_internal_buf_type_handle[] = {
>> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
>> b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
>> index
>> 8c0d6b7b5de85f7d7aaa8fc36218e8d095419569..c7020931a642f0484b6f84af7ab51242e1845458
>> 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
>> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
>> @@ -116,6 +116,7 @@ struct iris_inst;
>> #define SIZE_AV1D_TILE_OFFSET 65536
>> #define SIZE_AV1D_QM 3328
>> #define SIZE_AV1D_PROB_TABLE 22784
>> +#define SIZE_AV1D_ARP 9728
>>
>> #define SIZE_SLICE_CMD_BUFFER (ALIGN(20480, 256))
>> #define SIZE_SPS_PPS_SLICE_HDR (2048 + 4096)
>>
>> --
>> 2.43.0
>>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4/5] media: iris: fix VPU4x encoder line buffer size calculations
2026-09-14 13:00 [PATCH 0/5] media: iris: add support for maili platform Wangao Wang
` (2 preceding siblings ...)
2026-09-14 13:00 ` [PATCH 3/5] media: iris: add AV1 decode buffer size support for vpu4x Wangao Wang
@ 2026-09-14 13:00 ` Wangao Wang
2026-09-14 19:49 ` Bryan O'Donoghue
2026-09-14 13:00 ` [PATCH 5/5] media: iris: add maili platform data Wangao Wang
4 siblings, 1 reply; 11+ messages in thread
From: Wangao Wang @ 2026-09-14 13:00 UTC (permalink / raw)
To: Bryan O'Donoghue, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy
Cc: linux-media, linux-arm-msm, devicetree, linux-kernel, Wangao Wang
size_vpss_line_buf_vpu33() expects (num_pipes, height, width) but was
called with width and height swapped, miscalculating VPSS line buffer
size for non-square resolutions.
iris_vpu4x_enc_line_size was reading resolutions directly from
inst->fmt_dst. Use iris_vpu_enc_get_bitstream_{width,height}() which
account for the 90/270-degree rotation case.
Fixes: df816dce1b01 ("media: iris: Introduce buffer size calculations for vpu4")
Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
index 55996fd0d14c385ee63d2577b3e6d71b51d9e541..c4922a25b4501a851e31fcc85bc13735803be366 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
@@ -2059,8 +2059,8 @@ static u32 hfi_vpu4x_buffer_line_enc(u32 frame_width, u32 frame_height,
u32 dma_opb_lb_size = size_dma_opb_lb(num_vpp_pipes_enc, frame_width_coded,
frame_height_coded);
u32 dse_lb_size = ALIGN((256 + (16 * (frame_width_coded >> 4))), DMA_ALIGNMENT);
- u32 size_vpss_lb_enc = size_vpss_line_buf_vpu33(num_vpp_pipes_enc, frame_width_coded,
- frame_height_coded);
+ u32 size_vpss_lb_enc = size_vpss_line_buf_vpu33(num_vpp_pipes_enc, frame_height_coded,
+ frame_width_coded);
return se_lb_size + te_lb_size + fe_lb_size + md_lb_size + dma_opb_lb_size +
dse_lb_size + size_vpss_lb_enc;
@@ -2070,9 +2070,8 @@ static u32 iris_vpu4x_enc_line_size(struct iris_inst *inst)
{
u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
u32 lcu_size = inst->codec == V4L2_PIX_FMT_HEVC ? 32 : 16;
- struct v4l2_format *f = inst->fmt_dst;
- u32 height = f->fmt.pix_mp.height;
- u32 width = f->fmt.pix_mp.width;
+ u32 height = iris_vpu_enc_get_bitstream_height(inst);
+ u32 width = iris_vpu_enc_get_bitstream_width(inst);
return hfi_vpu4x_buffer_line_enc(width, height, 0, num_vpp_pipes,
lcu_size, inst->codec);
--
2.43.0
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 4/5] media: iris: fix VPU4x encoder line buffer size calculations
2026-09-14 13:00 ` [PATCH 4/5] media: iris: fix VPU4x encoder line buffer size calculations Wangao Wang
@ 2026-09-14 19:49 ` Bryan O'Donoghue
0 siblings, 0 replies; 11+ messages in thread
From: Bryan O'Donoghue @ 2026-09-14 19:49 UTC (permalink / raw)
To: Wangao Wang, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy
Cc: linux-media, linux-arm-msm, devicetree, linux-kernel
On 14/09/2026 14:00, Wangao Wang wrote:
> size_vpss_line_buf_vpu33() expects (num_pipes, height, width) but was
> called with width and height swapped, miscalculating VPSS line buffer
> size for non-square resolutions.
>
> iris_vpu4x_enc_line_size was reading resolutions directly from
> inst->fmt_dst. Use iris_vpu_enc_get_bitstream_{width,height}() which
> account for the 90/270-degree rotation case.
>
> Fixes: df816dce1b01 ("media: iris: Introduce buffer size calculations for vpu4")
>
> Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> index 55996fd0d14c385ee63d2577b3e6d71b51d9e541..c4922a25b4501a851e31fcc85bc13735803be366 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> @@ -2059,8 +2059,8 @@ static u32 hfi_vpu4x_buffer_line_enc(u32 frame_width, u32 frame_height,
> u32 dma_opb_lb_size = size_dma_opb_lb(num_vpp_pipes_enc, frame_width_coded,
> frame_height_coded);
> u32 dse_lb_size = ALIGN((256 + (16 * (frame_width_coded >> 4))), DMA_ALIGNMENT);
> - u32 size_vpss_lb_enc = size_vpss_line_buf_vpu33(num_vpp_pipes_enc, frame_width_coded,
> - frame_height_coded);
> + u32 size_vpss_lb_enc = size_vpss_line_buf_vpu33(num_vpp_pipes_enc, frame_height_coded,
> + frame_width_coded);
Only this much belongs in this patch - the fix.
>
> return se_lb_size + te_lb_size + fe_lb_size + md_lb_size + dma_opb_lb_size +
> dse_lb_size + size_vpss_lb_enc;
> @@ -2070,9 +2070,8 @@ static u32 iris_vpu4x_enc_line_size(struct iris_inst *inst)
> {
> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
> u32 lcu_size = inst->codec == V4L2_PIX_FMT_HEVC ? 32 : 16;
> - struct v4l2_format *f = inst->fmt_dst;
> - u32 height = f->fmt.pix_mp.height;
> - u32 width = f->fmt.pix_mp.width;
> + u32 height = iris_vpu_enc_get_bitstream_height(inst);
> + u32 width = iris_vpu_enc_get_bitstream_width(inst);
>
> return hfi_vpu4x_buffer_line_enc(width, height, 0, num_vpp_pipes,
> lcu_size, inst->codec);
>
> --
> 2.43.0
>
This change should go into its own patch since the original here doesn't
swap height and width, so if that is a fix, it should go into its own
fixes patch.
Best practice is to stack your fixes at the start of your series so that
you can be sure your fixes don't depend on whatever functionality you
are enabling.
---
bod
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/5] media: iris: add maili platform data
2026-09-14 13:00 [PATCH 0/5] media: iris: add support for maili platform Wangao Wang
` (3 preceding siblings ...)
2026-09-14 13:00 ` [PATCH 4/5] media: iris: fix VPU4x encoder line buffer size calculations Wangao Wang
@ 2026-09-14 13:00 ` Wangao Wang
4 siblings, 0 replies; 11+ messages in thread
From: Wangao Wang @ 2026-09-14 13:00 UTC (permalink / raw)
To: Bryan O'Donoghue, Vikash Garodia, Dikshita Agarwal,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Stanimir Varbanov, Abhinav Kumar, Hans Verkuil,
Vishnu Reddy
Cc: linux-media, linux-arm-msm, devicetree, linux-kernel, Wangao Wang
Add platform data for the Maili Iris VPU4 block so the driver can
match the qcom,maili-iris compatible and initialize the hardware.
Describe the Maili-specific clocks, power domains, firmware, resets,
bandwidth data, DMA range, secure memory configuration, and decode
capabilities.
Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/Makefile | 1 +
.../platform/qcom/iris/iris_platform_common.h | 4 +
.../media/platform/qcom/iris/iris_platform_maili.h | 40 ++++++++++
.../media/platform/qcom/iris/iris_platform_vpu4x.c | 86 ++++++++++++++++++++++
drivers/media/platform/qcom/iris/iris_probe.c | 4 +
5 files changed, 135 insertions(+)
diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
index 48e415cbc4390bc596f6239fefa2a2ad2cd3a2bb..f8a017d878d620fe1d82708624595583aa2ffd99 100644
--- a/drivers/media/platform/qcom/iris/Makefile
+++ b/drivers/media/platform/qcom/iris/Makefile
@@ -14,6 +14,7 @@ qcom-iris-objs += iris_buffer.o \
iris_hfi_queue.o \
iris_platform_vpu2.o \
iris_platform_vpu3x.o \
+ iris_platform_vpu4x.o \
iris_power.o \
iris_probe.o \
iris_resources.o \
diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index 9748095091461ba13443c63955a42906fa4f050c..61639d72bdcc9917983096e5b8f5905936784623 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -39,6 +39,9 @@ struct iris_inst;
#define MAX_HEVC_VBR_LAYER_HP_SLIDING_WINDOW 5
#define MAX_HIER_CODING_LAYER_GEN1 6
+#define VIDEO_REGION_VM0_SECURE_NP_ID 1
+#define VIDEO_REGION_VM0_NONSECURE_NP_ID 5
+
enum stage_type {
STAGE_1 = 1,
STAGE_2 = 2,
@@ -54,6 +57,7 @@ extern const struct iris_firmware_data iris_hfi_gen1_data;
extern const struct iris_firmware_data iris_hfi_gen2_data;
extern const struct iris_firmware_data iris_hfi_milos_data;
+extern const struct iris_platform_data maili_data;
extern const struct iris_platform_data milos_data;
extern const struct iris_platform_data qcs8300_data;
extern const struct iris_platform_data sc7280_data;
diff --git a/drivers/media/platform/qcom/iris/iris_platform_maili.h b/drivers/media/platform/qcom/iris/iris_platform_maili.h
new file mode 100644
index 0000000000000000000000000000000000000000..b0c48743485a176fb9855a841955413d7093c7d4
--- /dev/null
+++ b/drivers/media/platform/qcom/iris/iris_platform_maili.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+
+#ifndef __IRIS_PLATFORM_MAILI_H__
+#define __IRIS_PLATFORM_MAILI_H__
+
+static const char *const maili_pmdomain_table[] = {
+ "venus",
+ "vcodec0",
+ "vpp0",
+};
+
+static const struct platform_clk_data maili_clk_table[] = {
+ { IRIS_AXI_CLK, "iface" },
+ { IRIS_AXI1_CLK, "iface1" },
+ { IRIS_CTRL_CLK, "core" },
+ { IRIS_CTRL_FREERUN_CLK, "core_freerun" },
+ { IRIS_HW_CLK, "vcodec0_core" },
+ { IRIS_HW_FREERUN_CLK, "vcodec0_core_freerun" },
+ { IRIS_BSE_HW_CLK, "vcodec_bse" },
+ { IRIS_VPP0_HW_CLK, "vcodec_vpp0" },
+};
+
+static const char *const maili_opp_clk_table[] = {
+ "vcodec0_core",
+ "vcodec_bse",
+ "core",
+ NULL,
+};
+
+static const char *const vpu4x_clk_reset_table[] = {
+ "bus0",
+ "bus1",
+ "core",
+ "vcodec0_core",
+};
+
+#endif
diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu4x.c b/drivers/media/platform/qcom/iris/iris_platform_vpu4x.c
new file mode 100644
index 0000000000000000000000000000000000000000..d39acb1552dca4ae61dbc7875040be25c196aba6
--- /dev/null
+++ b/drivers/media/platform/qcom/iris/iris_platform_vpu4x.c
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+
+#include "iris_core.h"
+#include "iris_ctrls.h"
+#include "iris_hfi_gen2.h"
+#include "iris_hfi_gen2_defines.h"
+#include "iris_platform_common.h"
+#include "iris_vpu_buffer.h"
+#include "iris_vpu_common.h"
+
+#include "iris_platform_sm8550.h"
+#include "iris_platform_maili.h"
+
+static const struct iris_firmware_desc iris_vpu40_p1_s8_gen2_desc = {
+ .firmware_data = &iris_hfi_gen2_data,
+ .get_vpu_buffer_size = iris_vpu4x_buf_size,
+ .fwname = "qcom/vpu/vpu40_p1_s8.mbn",
+};
+
+static const u32 iris_fmts_vpu4x_dec[] = {
+ [IRIS_FMT_H264] = V4L2_PIX_FMT_H264,
+ [IRIS_FMT_HEVC] = V4L2_PIX_FMT_HEVC,
+ [IRIS_FMT_VP9] = V4L2_PIX_FMT_VP9,
+ [IRIS_FMT_AV1] = V4L2_PIX_FMT_AV1,
+};
+
+static const struct icc_info iris_icc_info_vpu4x[] = {
+ { "cpu-cfg", 1000, 1000 },
+ { "video-mem", 1000, 15000000 },
+};
+
+static const struct bw_info iris_bw_table_dec_vpu4x[] = {
+ { ((4096 * 2160) / 256) * 60, 1608000 },
+ { ((4096 * 2160) / 256) * 30, 826000 },
+ { ((1920 * 1080) / 256) * 60, 567000 },
+ { ((1920 * 1080) / 256) * 30, 294000 },
+};
+
+static const char * const iris_opp_pd_table_vpu4x[] = { "mxc", "mmcx" };
+
+static const struct tz_cp_config tz_cp_config_vpu4x[] = {
+ {
+ .cp_start = VIDEO_REGION_VM0_SECURE_NP_ID,
+ .cp_size = 0,
+ .cp_nonpixel_start = 0x01000000,
+ .cp_nonpixel_size = 0x24800000,
+ },
+ {
+ .cp_start = VIDEO_REGION_VM0_NONSECURE_NP_ID,
+ .cp_size = 0,
+ .cp_nonpixel_start = 0x25800000,
+ .cp_nonpixel_size = 0xda400000,
+ },
+};
+
+const struct iris_platform_data maili_data = {
+ .firmware_desc_gen2 = &iris_vpu40_p1_s8_gen2_desc,
+ .vpu_ops = &iris_vpu4x_ops,
+ .icc_tbl = iris_icc_info_vpu4x,
+ .icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu4x),
+ .clk_rst_tbl = vpu4x_clk_reset_table,
+ .clk_rst_tbl_size = ARRAY_SIZE(vpu4x_clk_reset_table),
+ .bw_tbl_dec = iris_bw_table_dec_vpu4x,
+ .bw_tbl_dec_size = ARRAY_SIZE(iris_bw_table_dec_vpu4x),
+ .pmdomain_tbl = maili_pmdomain_table,
+ .pmdomain_tbl_size = ARRAY_SIZE(maili_pmdomain_table),
+ .opp_pd_tbl = iris_opp_pd_table_vpu4x,
+ .opp_pd_tbl_size = ARRAY_SIZE(iris_opp_pd_table_vpu4x),
+ .clk_tbl = maili_clk_table,
+ .clk_tbl_size = ARRAY_SIZE(maili_clk_table),
+ .opp_clk_tbl = maili_opp_clk_table,
+ /* Upper bound of DMA address range */
+ .dma_mask = 0xffc00000 - 1,
+ .inst_iris_fmts = iris_fmts_vpu4x_dec,
+ .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu4x_dec),
+ .inst_caps = &platform_inst_cap_sm8550,
+ .tz_cp_config_data = tz_cp_config_vpu4x,
+ .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu4x),
+ .num_vpp_pipe = 1,
+ .max_session_count = 16,
+ .max_core_mbpf = NUM_MBS_8K,
+ .max_core_mbps = NUM_MBS_8K * 30,
+};
diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
index 4bdb078d83b5c331869dab2409bc4d10ab302737..be8a102e239c34620d540c54f1f034a9236da7a7 100644
--- a/drivers/media/platform/qcom/iris/iris_probe.c
+++ b/drivers/media/platform/qcom/iris/iris_probe.c
@@ -427,6 +427,10 @@ static const struct dev_pm_ops iris_pm_ops = {
};
static const struct of_device_id iris_dt_match[] = {
+ {
+ .compatible = "qcom,maili-iris",
+ .data = &maili_data,
+ },
{
.compatible = "qcom,milos-iris",
.data = &milos_data,
--
2.43.0
^ permalink raw reply [flat|nested] 11+ messages in thread