Support H264 multi-core encoder on MT8195
Subsystems (4)
v5 cover Support H264 multi-core encoder on MT8195
MT8195 has two H264 encoder hardware, named core0 and core1, this two cores can encode two input frames separately at the same time to achieve higher performance.
This series of patches are used to enable the two H264 encoder cores, the difference between encoding process before and after enable two cores is just like as below:
As-Is: Synchronous
V4L2_VIDIOC_QBUF#0 --> device_run(triger encoder) --> wait encoder IRQ -->
encoding done with result --> job_finish
V4l2_VIDIOC_QBUF#1 --> device_run(triger encoder) --> wait encoder IRQ -->
encoding done with result --> job_finish
...
To-Be: Asynchronous
V4L2_VIDIOC_QBUF#0 --> device_run(triger encoder) --> job_finish ..V4l2_VIDIOC_QBUF#1 --> device_run(triger encoder) --> job_finish (venc core0 may encode done here, done the encoding result to client) V4L2_VIDIOC_QBUF#2 --> device_run(triger encoder) --> job_finish.
---
changes compared with v4:
- reabse to the newer linux media stage tree.
- remove "mediatek,venc-multi-core" property since sub-device can be probed by of_platform_populate api directly.
- some modifications for patch v4's review comments.
changes compared with v3:
- rebase to the newer linux media stage.
- add a capability to indicate scp firmware support multi-core.
- probe core0 as main device, core1 as sub-device.
changes compared with v2:
- update venc core dt-bindings, add two new properties for current usage.
- parse venc multi_core mode from device tree.
- rebase to the newer linux media stage.
changes compared with v1:
- of_platform_populate was used in place of the component framework.
- new yaml file for venc cores.
- some modifications for patch v1's review comments.
---
Irui Wang (8):
dt-bindings: media: mediatek: vcodec: Adds encoder cores dt-bindings
for mt8195
media: mediatek: vcodec: Enable venc dual core usage
media: mediatek: vcodec: Refactor venc power manage function
media: mediatek: vcodec: Add more extra processing for multi-core
encoding
media: mediatek: vcodec: Add venc power on/off function
media: mediatek: vcodec: Refactor encoder clock on/off function
media: mediatek: vcodec: Add multi-core encoding process
media: mediatek: vcodec: Return encoding result in asynchronous mode
.../media/mediatek,vcodec-encoder-core.yaml | 218 ++++++++++++++++ .../media/mediatek,vcodec-encoder.yaml | 1 - .../media/platform/mediatek/vcodec/Makefile | 4 +- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 28 +- .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 113 ++++++-- .../platform/mediatek/vcodec/mtk_vcodec_enc.h | 11 +- .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 44 +++- .../mediatek/vcodec/mtk_vcodec_enc_hw.c | 156 +++++++++++ .../mediatek/vcodec/mtk_vcodec_enc_hw.h | 34 +++ .../mediatek/vcodec/mtk_vcodec_enc_pm.c | 178 +++++++++++-- .../mediatek/vcodec/mtk_vcodec_enc_pm.h | 11 +- .../mediatek/vcodec/mtk_vcodec_util.c | 19 ++ .../mediatek/vcodec/mtk_vcodec_util.h | 3 + .../mediatek/vcodec/venc/venc_h264_if.c | 243 ++++++++++++++---- .../mediatek/vcodec/venc/venc_vp8_if.c | 3 +- .../platform/mediatek/vcodec/venc_drv_if.c | 75 ++++-- .../platform/mediatek/vcodec/venc_drv_if.h | 6 + .../platform/mediatek/vcodec/venc_vpu_if.c | 9 +- .../platform/mediatek/vcodec/venc_vpu_if.h | 3 +- 19 files changed, 1028 insertions(+), 131 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-encoder-core.yaml create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h
Signature · 1 line
2.18.0
PATCH v5 1/8 dt-bindings: media: mediatek: vcodec: Adds encoder cores dt-bindings for mt8195
mt8195 has two H264 encoder hardware, which are named core0 and core1. The two encoder cores are independent, we can just enable one core to do encoding or enable both of them to achieve higher performance. We pick core0 as main device and core1 as its subdevice, it just a way to to manage the two encoder hardware, because they are two equal encoder hardware with the same function.
--- .../media/mediatek,vcodec-encoder-core.yaml | 218 ++++++++++++++++++ .../media/mediatek,vcodec-encoder.yaml | 1 - 2 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-encoder-core.yaml
Documentation/devicetree/bindings/media/mediatek,vcodec-encoder-core.yaml new file +218 -0
@@ -0,0 +1,218 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) + +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/media/mediatek,vcodec-encoder-core.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: MediaTek Video Encoder Accelerator With Multi Core + +maintainers: + - Irui Wang <[email protected]> + +description: | + MediaTek Video Encoder is the video encoder hardware present in MediaTek + SoCs which supports high resolution encoding functionalities. To meet higher + encoder performance, there will be one or more encoder hardware inside SoC, + which named core0, core1, etc.. For example, mt8195 has two encoder hardware, + the two encoder cores block diagram, can check below. + -------------------------------------------------------------- + Input frame 0 1 2 3 4 5 6 + | | | | | | | + v | v | v | v + +-------+ | +-------+ | +-------+ | +-------+ + | core0 | | | core0 | | | core0 | | | core0 | + +-------+ | +-------+ | +-------+ | +-------+ + | | | | | | | + | v | v | v | + | +-------+ | +-------+ | +-------+ | + | | core1 | | | core1 | | | core1 | | + | +-------+ | +-------+ | +-------+ | + | | | | | | | + v v v v v v v <parent> + -------------------------------------------------------------- + core || index <child> + \/ + +--------------------------------------------------+ + | core0/core1 | + | enable/disable power/clk/irq | + +--------------------------------------------------+ + -------------------------------------------------------------- + As above, there are two cores child devices, they are two encoder hardware + which can encode input frames in order. When start encoding, input frame 0 + will be encoded by core0, and input frame 1 can be encoded by core1 even if + frame 0 has not been encoded done yet, after frame 0 encoded done, frame 2 + will be encoded by core0, even input frames are encoded by core0 and odd + input frames are encoded by core1, these two encoder cores encode ench input + frames in this overlapping manner. + +properties: + compatible: + items: + - enum: + - mediatek,mt8195-vcodec-enc + + reg: + maxItems: 1 + + mediatek,scp: + $ref: /schemas/types.yaml#/definitions/phandle + description: | + The node of system control processor (SCP), using + the remoteproc & rpmsg framework. + + iommus: + minItems: 1 + maxItems: 32 + description: | + List of the hardware port in respective IOMMU block for current Socs. + Refer to bindings/iommu/mediatek,iommu.yaml. + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + maxItems: 1 + + power-domains: + maxItems: 1 + + dma-ranges: + maxItems: 1 + description: | + Describes the physical address space of IOMMU maps to memory. + + "#address-cells": + const: 2 + + "#size-cells": + const: 2 + + ranges: true + +# Required child node: +patternProperties: + "^venc-core@[0-9a-f]+$": + type: object + description: | + The video encoder core device node which should be added as subnodes to + the main venc node, it represents a encoder hardware. + + properties: + compatible: + items: + - const: mediatek,mtk-venc-hw + + reg: + maxItems: 1 + + mediatek,hw-id: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + Current encoder core id. We use it to pick which one encoder core + will be used to encoding current input frame. + + iommus: + minItems: 1 + maxItems: 32 + description: | + List of the hardware port in respective IOMMU block for current Socs. + Refer to bindings/iommu/mediatek,iommu.yaml. + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + maxItems: 1 + + power-domains: + maxItems: 1 + + required: + - compatible + - reg + - mediatek,hw-id + - iommus + - interrupts + - clocks + - clock-names + - assigned-clocks + - assigned-clock-parents + - power-domains + + additionalProperties: false + +required: + - compatible + - reg + - mediatek,scp + - iommus + - interrupts + - clocks + - clock-names + - dma-ranges + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/memory/mt8195-memory-port.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/clock/mt8195-clk.h> + #include <dt-bindings/power/mt8195-power.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + venc: venc@1a020000 { + compatible = "mediatek,mt8195-vcodec-enc"; + reg = <0 0x1a020000 0 0x10000>; + mediatek,scp = <&scp>; + iommus = <&iommu_vdo M4U_PORT_L19_VENC_RCPU>, + <&iommu_vdo M4U_PORT_L19_VENC_REC>, + <&iommu_vdo M4U_PORT_L19_VENC_BSDMA>, + <&iommu_vdo M4U_PORT_L19_VENC_SV_COMV>, + <&iommu_vdo M4U_PORT_L19_VENC_RD_COMV>, + <&iommu_vdo M4U_PORT_L19_VENC_CUR_LUMA>, + <&iommu_vdo M4U_PORT_L19_VENC_CUR_CHROMA>, + <&iommu_vdo M4U_PORT_L19_VENC_REF_LUMA>, + <&iommu_vdo M4U_PORT_L19_VENC_REF_CHROMA>; + interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&vencsys CLK_VENC_VENC>; + clock-names = "clk_venc"; + power-domains = <&spm MT8195_POWER_DOMAIN_VENC>; + dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 0xfff00000>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + venc-core@1b020000 { + compatible = "mediatek,mtk-venc-hw"; + reg = <0 0x1b020000 0 0x10000>; + mediatek,hw-id = <1>; + iommus = <&iommu_vpp M4U_PORT_L20_VENC_RCPU>, + <&iommu_vpp M4U_PORT_L20_VENC_REC>, + <&iommu_vpp M4U_PORT_L20_VENC_BSDMA>, + <&iommu_vpp M4U_PORT_L20_VENC_SV_COMV>, + <&iommu_vpp M4U_PORT_L20_VENC_RD_COMV>, + <&iommu_vpp M4U_PORT_L20_VENC_CUR_LUMA>, + <&iommu_vpp M4U_PORT_L20_VENC_CUR_CHROMA>, + <&iommu_vpp M4U_PORT_L20_VENC_REF_LUMA>, + <&iommu_vpp M4U_PORT_L20_VENC_REF_CHROMA>; + interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&vencsys_core1 CLK_VENC_CORE1_VENC>; + clock-names = "clk_venc_core1"; + assigned-clocks = <&topckgen CLK_TOP_VENC>; + assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D4>; + power-domains = <&spm MT8195_POWER_DOMAIN_VENC_CORE1>; + }; + }; + };
Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +0 -1
@@ -21,7 +21,6 @@ properties: - mediatek,mt8173-vcodec-enc - mediatek,mt8183-vcodec-enc - mediatek,mt8192-vcodec-enc - - mediatek,mt8195-vcodec-enc reg: maxItems: 1
Signature · 1 line
2.18.0
PATCH v5 2/8 media: mediatek: vcodec: Enable venc dual core usage
In reply to Irui WangAdds new property to indicate whether the encoder has multiple cores. Use of_platform_populate to probe each venc cores, the core device can use the init_clk/request_irq helper to initialize their own power/clk/irq.
--- .../media/platform/mediatek/vcodec/Makefile | 4 +- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 12 ++ .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 6 + .../mediatek/vcodec/mtk_vcodec_enc_hw.c | 136 ++++++++++++++++++ .../mediatek/vcodec/mtk_vcodec_enc_hw.h | 36 +++++ 5 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h
drivers/media/platform/mediatek/vcodec/Makefile +3 -1
@@ -3,7 +3,8 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-dec.o \ mtk-vcodec-enc.o \ mtk-vcodec-common.o \ - mtk-vcodec-dec-hw.o + mtk-vcodec-dec-hw.o \ + mtk_vcodec_enc_hw.o mtk-vcodec-dec-y := vdec/vdec_h264_if.o \ vdec/vdec_vp8_if.o \
@@ -32,6 +33,7 @@ mtk-vcodec-enc-y := venc/venc_vp8_if.o \ venc_drv_if.o \ venc_vpu_if.o \ +mtk-vcodec-enc-hw-y := mtk_vcodec_enc_hw.o mtk-vcodec-common-y := mtk_vcodec_intr.o \ mtk_vcodec_util.o \
drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +12 -0
@@ -95,6 +95,15 @@ enum mtk_fmt_type { MTK_FMT_FRAME = 2, }; +/* +* enum mtk_venc_hw_id -- encoder hardware id +*/ +enum mtk_venc_hw_id { +MTK_VENC_CORE_0 =0 , +MTK_VENC_CORE_1 , +MTK_VENC_HW_MAX , +}; +/* * enum mtk_vdec_hw_id - Hardware index used to separate * different hardware
@@ -464,6 +473,7 @@ struct mtk_vcodec_enc_pdata {* @dec_active_cnt: used to mark whether need to record register value * @vdec_racing_info: record register value * @dec_racing_info_mutex: mutex lock used for inner racing mode +* @enc_hw_dev: used to store venc core device */ struct mtk_vcodec_dev {struct v4l2_device v4l2_dev;
@@ -514,6 +524,8 @@ struct mtk_vcodec_dev {u32 vdec_racing_info[132 ];/* Protects access to vdec_racing_info data */ struct mutex dec_racing_info_mutex; + +void *enc_hw_dev[MTK_VENC_HW_MAX ]; };static inline struct mtk_vcodec_ctx *fh_to_ctx (struct v4l2_fh *fh)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +6 -0
@@ -263,6 +263,12 @@ static int mtk_vcodec_probe(struct platform_device *pdev) goto err_enc_pm; } + ret =of_platform_populate (pdev->dev.of_node,NULL ,NULL , &pdev->dev); +if (ret) { +mtk_v4l2_err ("Failed to populate children devices" ); + goto err_enc_pm; + } +pm_runtime_enable (&pdev->dev); dev->reg_base[dev->venc_pdata->core_id] =
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c new file +136 -0
136 lines not on this page · raw message
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2021 MediaTek Inc. +*/ + +#ifndef _MTK_VCODEC_ENC_HW_H_ +#define _MTK_VCODEC_ENC_HW_H_ + +#include <linux/platform_device.h> +#include "mtk_vcodec_drv.h" + +/** +* struct mtk_venc_hw_dev - driver data +* @plat_dev: platform_device +* @main_dev: main device +* @pm: power management data +* @curr_ctx: the context that is waiting for venc hardware +* @reg_base: mapped address of venc registers +* @irq_status: venc hardware irq status +* @enc_irq: venc device irq +* @hw_id: for venc hardware id: core#0, core#1... +*/ +struct mtk_venc_hw_dev { +struct platform_device *plat_dev; +struct mtk_vcodec_dev *main_dev; + +struct mtk_vcodec_pm pm; +struct mtk_vcodec_ctx *curr_ctx; + +void __iomem *reg_base; +unsigned int irq_status; +int enc_irq; +enum mtk_venc_hw_id hw_id; +}; + +#endif /* _MTK_VCODEC_ENC_HW_H_ */
Signature · 1 line
2.18.0
PATCH v5 3/8 media: mediatek: vcodec: Refactor venc power manage function
In reply to Irui WangThe args "struct mtk_vcodec_dev *" doesn't appropriate for init_clk functions because of sub-devices, sub-devices will init their own "pm/clk" instead, so refactor the pm function with args "platform_device *" and "mtk_vcodec_pm*".
--- .../media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 2 +- .../media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c | 8 ++++++++ .../media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c | 9 +++------ .../media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h | 3 ++- 4 files changed, 14 insertions(+), 8 deletions(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +1 -1
@@ -257,7 +257,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)return PTR_ERR (dev->fw_handler); dev->venc_pdata =of_device_get_match_data (&pdev->dev); - ret =mtk_vcodec_init_enc_clk (dev); + ret =mtk_vcodec_init_enc_clk (dev->plat_dev, &dev->pm);if (ret <0 ) {dev_err (&pdev->dev,"Failed to get mtk vcodec clock source!" ); goto err_enc_pm;
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c +8 -0
@@ -13,6 +13,7 @@#include "mtk_vcodec_drv.h" #include "mtk_vcodec_enc.h" #include "mtk_vcodec_enc_hw.h" +#include "mtk_vcodec_enc_pm.h" #include "mtk_vcodec_intr.h" static const struct of_device_id mtk_venc_hw_ids[] = {
@@ -115,6 +116,13 @@ static int mtk_venc_hw_probe(struct platform_device *pdev)return dev_err_probe (dev, (ret ? ret : -EINVAL ),"Cannot parse hardware id" ); + ret =mtk_vcodec_init_enc_clk (sub_core->plat_dev, &sub_core->pm); +if (ret <0 ) +return dev_err_probe (dev, ret, +"Failed to get venc core clock source!" ); + +pm_runtime_enable (&pdev->dev); + main_dev->enc_hw_dev[sub_core->hw_id] = sub_core; sub_core->main_dev = main_dev;
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c +3 -6
@@ -12,17 +12,13 @@#include "mtk_vcodec_enc_pm.h" #include "mtk_vcodec_util.h" -int mtk_vcodec_init_enc_clk (struct mtk_vcodec_dev *mtkdev) +int mtk_vcodec_init_enc_clk (struct platform_device *pdev, +struct mtk_vcodec_pm *pm) { -struct platform_device *pdev; -struct mtk_vcodec_pm *pm;struct mtk_vcodec_clk *enc_clk;struct mtk_vcodec_clk_info *clk_info;int ret, i; - pdev = mtkdev->plat_dev; - pm = &mtkdev->pm; -memset (pm,0 ,sizeof (struct mtk_vcodec_pm )); pm->dev = &pdev->dev; enc_clk = &pm->venc_clk;
@@ -58,6 +54,7 @@ int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *mtkdev)return 0 ; } +EXPORT_SYMBOL_GPL (mtk_vcodec_init_enc_clk);void mtk_vcodec_enc_clock_on (struct mtk_vcodec_pm *pm) {
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h +2 -1
@@ -9,7 +9,8 @@#include "mtk_vcodec_drv.h" -int mtk_vcodec_init_enc_clk (struct mtk_vcodec_dev *dev); +int mtk_vcodec_init_enc_clk (struct platform_device *pdev, +struct mtk_vcodec_pm *pm);void mtk_vcodec_enc_clock_on (struct mtk_vcodec_pm *pm);void mtk_vcodec_enc_clock_off (struct mtk_vcodec_pm *pm);
Signature · 1 line
2.18.0
PATCH v5 4/8 media: mediatek: vcodec: Add more extra processing for multi-core encoding
In reply to Irui WangAdd a bit for indicating support multi-core encoding, because multi-core encoding need more working buffers for encoder hardware. The working buffers are allocated from kernel side then pass to scp firmware side through shared memory, the struct definition must be kept align between kernel and scp firmware side. New another shared memory struct for multi-core encoding.
--- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 2 + .../mediatek/vcodec/mtk_vcodec_util.c | 19 ++ .../mediatek/vcodec/mtk_vcodec_util.h | 2 + .../mediatek/vcodec/venc/venc_h264_if.c | 207 +++++++++++++++--- 4 files changed, 195 insertions(+), 35 deletions(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +2 -0
@@ -27,6 +27,8 @@#define WAIT_INTR_TIMEOUT_MS 1000#define IS_VDEC_LAT_ARCH (hw_arch) ((hw_arch) >= MTK_VDEC_LAT_SINGLE_CORE)#define IS_VDEC_INNER_RACING (capability) ((capability) & MTK_VCODEC_INNER_RACING) +#define MTK_VENC_MULTICORE_ENABLE BIT(1) +#define IS_VENC_MULTICORE (capability) ((capability) & MTK_VENC_MULTICORE_ENABLE)/* * enum mtk_hw_reg_idx - MTK hw register base index
drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c +19 -0
@@ -11,6 +11,7 @@#include "mtk_vcodec_dec_hw.h" #include "mtk_vcodec_drv.h" +#include "mtk_vcodec_enc_hw.h" #include "mtk_vcodec_util.h" void __iomem *mtk_vcodec_get_reg_addr(struct mtk_vcodec_ctx *data,
@@ -26,6 +27,24 @@ void __iomem *mtk_vcodec_get_reg_addr(struct mtk_vcodec_ctx *data, }EXPORT_SYMBOL (mtk_vcodec_get_reg_addr); +void __iomem *mtk_venc_get_core_reg_addr (struct mtk_vcodec_ctx *ctx, +int hw_id) +{ +struct mtk_venc_hw_dev *sub_core; + +if (hw_id >=MTK_VENC_HW_MAX ) { +mtk_v4l2_err ("Invalid hw_id = %d" , hw_id); +return NULL ; + } + + sub_core = (struct mtk_venc_hw_dev *)ctx->dev->enc_hw_dev[hw_id]; +if (!sub_core) +return NULL ; + +return sub_core->reg_base; +} +EXPORT_SYMBOL (mtk_venc_get_core_reg_addr); +int mtk_vcodec_mem_alloc (struct mtk_vcodec_ctx *data,struct mtk_vcodec_mem *mem) {
drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h +2 -0
@@ -50,6 +50,8 @@ struct mtk_vcodec_dev;void __iomem *mtk_vcodec_get_reg_addr (struct mtk_vcodec_ctx *data,unsigned int reg_idx); +void __iomem *mtk_venc_get_core_reg_addr (struct mtk_vcodec_ctx *data, +int hw_id);int mtk_vcodec_mem_alloc (struct mtk_vcodec_ctx *data,struct mtk_vcodec_mem *mem); void mtk_vcodec_mem_free(struct mtk_vcodec_ctx *data,
drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c +172 -35
329 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v5 5/8 media: mediatek: vcodec: Add venc power on/off function
In reply to Irui Wangwhen enable multi-core encoding, all available encoder cores' power need to be on/off, add new functions for encoder cores' power management.
--- .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 31 +++---- .../mediatek/vcodec/mtk_vcodec_enc_pm.c | 83 +++++++++++++++++++ .../mediatek/vcodec/mtk_vcodec_enc_pm.h | 2 + .../platform/mediatek/vcodec/venc_drv_if.c | 6 -- 4 files changed, 97 insertions(+), 25 deletions(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +12 -19
@@ -8,10 +8,10 @@#include <media/v4l2-event.h> #include <media/v4l2-mem2mem.h> #include <media/videobuf2-dma-contig.h> -#include <linux/pm_runtime.h> #include "mtk_vcodec_drv.h" #include "mtk_vcodec_enc.h" +#include "mtk_vcodec_enc_pm.h" #include "mtk_vcodec_intr.h" #include "mtk_vcodec_util.h" #include "venc_drv_if.h"
@@ -877,8 +877,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) {struct mtk_vcodec_ctx *ctx =vb2_get_drv_priv (q);struct venc_enc_param param; -int ret, pm_ret; -int i; +int ret, i;/* Once state turn into MTK_STATE_ABORT, we need stop_streaming * to clear it
@@ -897,18 +896,12 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)return 0 ; } - ret =pm_runtime_resume_and_get (&ctx->dev->plat_dev->dev); -if (ret <0 ) { -mtk_v4l2_err ("pm_runtime_resume_and_get fail %d" , ret); - goto err_start_stream; - } -mtk_venc_set_param (ctx, ¶m); ret =venc_if_set_param (ctx,VENC_SET_PARAM_ENC , ¶m);if (ret) {mtk_v4l2_err ("venc_if_set_param failed=%d" , ret); ctx->state =MTK_STATE_ABORT ; - goto err_set_param; + goto err_start_stream; } ctx->param_change =MTK_ENCODE_PARAM_NONE ;
@@ -921,17 +914,19 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)if (ret) {mtk_v4l2_err ("venc_if_set_param failed=%d" , ret); ctx->state =MTK_STATE_ABORT ; - goto err_set_param; + goto err_start_stream; } ctx->state =MTK_STATE_HEADER ; } -return 0 ; + ret =mtk_vcodec_enc_power_on (ctx); +if (ret) { +mtk_v4l2_err ("mtk_vcodec_enc_power_on failed=%d" , ret); + ctx->state =MTK_STATE_ABORT ; + goto err_start_stream; + } -err_set_param: - pm_ret =pm_runtime_put (&ctx->dev->plat_dev->dev); -if (pm_ret <0 ) -mtk_v4l2_err ("pm_runtime_put fail %d" , pm_ret); +return 0 ; err_start_stream:for (i =0 ; i < q->num_buffers; ++i) {
@@ -1016,9 +1011,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q)if (ret)mtk_v4l2_err ("venc_if_deinit failed=%d" , ret); - ret =pm_runtime_put (&ctx->dev->plat_dev->dev); -if (ret <0 ) -mtk_v4l2_err ("pm_runtime_put fail %d" , ret); +mtk_vcodec_enc_power_off (ctx); ctx->state =MTK_STATE_FREE ; }
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c +83 -0
95 lines not on this page · raw message
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h +2 -0
@@ -12,6 +12,8 @@int mtk_vcodec_init_enc_clk (struct platform_device *pdev,struct mtk_vcodec_pm *pm); +int mtk_vcodec_enc_power_on (struct mtk_vcodec_ctx *ctx); +void mtk_vcodec_enc_power_off (struct mtk_vcodec_ctx *ctx);void mtk_vcodec_enc_clock_on (struct mtk_vcodec_pm *pm);void mtk_vcodec_enc_clock_off (struct mtk_vcodec_pm *pm);
drivers/media/platform/mediatek/vcodec/venc_drv_if.c +0 -6
@@ -32,9 +32,7 @@ int venc_if_init(struct mtk_vcodec_ctx *ctx, unsigned int fourcc) }mtk_venc_lock (ctx); -mtk_vcodec_enc_clock_on (&ctx->dev->pm); ret = ctx->enc_if->init (ctx); -mtk_vcodec_enc_clock_off (&ctx->dev->pm);mtk_venc_unlock (ctx);return ret;
@@ -46,9 +44,7 @@ int venc_if_set_param(struct mtk_vcodec_ctx *ctx,int ret =0 ;mtk_venc_lock (ctx); -mtk_vcodec_enc_clock_on (&ctx->dev->pm); ret = ctx->enc_if->set_param (ctx->drv_handle, type, in); -mtk_vcodec_enc_clock_off (&ctx->dev->pm);mtk_venc_unlock (ctx);return ret;
@@ -89,9 +85,7 @@ int venc_if_deinit(struct mtk_vcodec_ctx *ctx)return 0 ;mtk_venc_lock (ctx); -mtk_vcodec_enc_clock_on (&ctx->dev->pm); ret = ctx->enc_if->deinit (ctx->drv_handle); -mtk_vcodec_enc_clock_off (&ctx->dev->pm);mtk_venc_unlock (ctx); ctx->drv_handle =NULL ;
Signature · 1 line
2.18.0
PATCH v5 6/8 media: mediatek: vcodec: Refactor encoder clock on/off function
In reply to Irui Wangwhen enable multi-core encoding, encoder cores use their own clock, refactor clock management functions with used encoder hardware id.
--- .../mediatek/vcodec/mtk_vcodec_enc_pm.c | 89 ++++++++++++++++--- .../mediatek/vcodec/mtk_vcodec_enc_pm.h | 6 +- .../platform/mediatek/vcodec/venc_drv_if.c | 4 +- 3 files changed, 84 insertions(+), 15 deletions(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c +78 -11
@@ -60,7 +60,9 @@ EXPORT_SYMBOL_GPL(mtk_vcodec_init_enc_clk);static int mtk_enc_core_power_on (struct mtk_vcodec_ctx *ctx) {struct mtk_venc_hw_dev *sub_core; +struct mtk_vcodec_clk *clk;int ret, i; +int j =0 ;/* multi-core encoding need power on all available cores */ for (i =0 ; i <MTK_VENC_HW_MAX ; i++) {
@@ -73,12 +75,27 @@ static int mtk_enc_core_power_on(struct mtk_vcodec_ctx *ctx)mtk_v4l2_err ("power on sub_core[%d] fail %d" , i, ret); goto pm_on_fail; } + + clk = &sub_core->pm.venc_clk; +for (j =0 ; j < clk->clk_num; j++) { + ret =clk_prepare (clk->clk_info[j].vcodec_clk); +if (ret) { +mtk_v4l2_err ("prepare clk [%s] fail %d" , + clk->clk_info[j].clk_name, ret); + goto pm_on_fail; + } + } }return ret; pm_on_fail:for (i -=1 ; i >=0 ; i--) { sub_core = (struct mtk_venc_hw_dev *)ctx->dev->enc_hw_dev[i]; + + clk = &sub_core->pm.venc_clk; +for (j -=1 ; j >=0 ; j--) +clk_unprepare (clk->clk_info[j].vcodec_clk); +pm_runtime_put_sync (&sub_core->plat_dev->dev); }return ret;
@@ -87,7 +104,9 @@ static int mtk_enc_core_power_on(struct mtk_vcodec_ctx *ctx)int mtk_vcodec_enc_power_on (struct mtk_vcodec_ctx *ctx) {struct mtk_vcodec_pm *pm = &ctx->dev->pm; +struct mtk_vcodec_clk *clk;int ret; +int i =0 ; ret =pm_runtime_resume_and_get (pm->dev);if (ret) {
@@ -95,6 +114,16 @@ int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx)return ret; } + clk = &pm->venc_clk; +for (i =0 ; i < clk->clk_num; i++) { + ret =clk_prepare (clk->clk_info[i].vcodec_clk); +if (ret) { +mtk_v4l2_err ("prepare clk [%s] fail %d" , + clk->clk_info[i].clk_name, ret); + goto clk_error; + } + } +if (IS_VENC_MULTICORE (ctx->dev->enc_capability)) { ret =mtk_enc_core_power_on (ctx);if (ret) {
@@ -104,6 +133,9 @@ int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx) }return ret; +clk_error: +for (i -=1 ; i >=0 ; i--) +clk_unprepare (clk->clk_info[i].vcodec_clk); core_error:pm_runtime_put_sync (pm->dev);return ret;
@@ -112,7 +144,8 @@ int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx)static void mtk_enc_core_power_off (struct mtk_vcodec_ctx *ctx) {struct mtk_venc_hw_dev *sub_core; -int ret, i; +struct mtk_vcodec_clk *clk; +int ret, i, j;/* multi-core encoding need power off all available cores */ for (i =0 ; i <MTK_VENC_HW_MAX ; i++) {
@@ -120,6 +153,10 @@ static void mtk_enc_core_power_off(struct mtk_vcodec_ctx *ctx)if (!sub_core)continue ; + clk = &sub_core->pm.venc_clk; +for (j = clk->clk_num -1 ; j >=0 ; j--) +clk_unprepare (clk->clk_info[j].vcodec_clk); + ret =pm_runtime_put_sync (&sub_core->plat_dev->dev);if (ret)mtk_v4l2_err ("power off sub_core[%d] fail %d" , i, ret);
@@ -129,26 +166,44 @@ static void mtk_enc_core_power_off(struct mtk_vcodec_ctx *ctx)void mtk_vcodec_enc_power_off (struct mtk_vcodec_ctx *ctx) {struct mtk_vcodec_pm *pm = &ctx->dev->pm; -int ret; +struct mtk_vcodec_clk *clk; +int ret, i;if (IS_VENC_MULTICORE (ctx->dev->enc_capability))mtk_enc_core_power_off (ctx); + clk = &pm->venc_clk; +for (i = clk->clk_num -1 ; i >=0 ; i--) +clk_unprepare (clk->clk_info[i].vcodec_clk); + ret =pm_runtime_put_sync (pm->dev);if (ret)mtk_v4l2_err ("pm_runtime_put_sync fail %d" , ret); } -void mtk_vcodec_enc_clock_on (struct mtk_vcodec_pm *pm) +void mtk_vcodec_enc_clock_on (struct mtk_vcodec_dev *dev, +enum mtk_venc_hw_id hw_id) { -struct mtk_vcodec_clk *enc_clk = &pm->venc_clk; +struct mtk_venc_hw_dev *sub_core; +struct mtk_vcodec_clk *enc_clk; +int ret, i =0 ; +if (hw_id ==MTK_VENC_CORE_0 ) { + enc_clk = &dev->pm.venc_clk; + }else if (hw_id ==MTK_VENC_CORE_1 ) { + sub_core = (struct mtk_venc_hw_dev *)dev->enc_hw_dev[hw_id]; + enc_clk = &sub_core->pm.venc_clk; + }else { +mtk_v4l2_err ("invalid hw id : %d" , hw_id); +return ; + } +for (i =0 ; i < enc_clk->clk_num; i++) { - ret =clk_prepare_enable (enc_clk->clk_info[i].vcodec_clk); + ret =clk_enable (enc_clk->clk_info[i].vcodec_clk);if (ret) { -mtk_v4l2_err ("venc clk_prepare_enable %d %s fail %d" , i, - enc_clk->clk_info[i].clk_name, ret); +mtk_v4l2_err ("venc clk_enable %d %s fail %d" , i, + enc_clk->clk_info[i].clk_name, ret); goto clkerr; } }
@@ -157,14 +212,26 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm) clkerr:for (i -=1 ; i >=0 ; i--) -clk_disable_unprepare (enc_clk->clk_info[i].vcodec_clk); +clk_disable (enc_clk->clk_info[i].vcodec_clk); } -void mtk_vcodec_enc_clock_off (struct mtk_vcodec_pm *pm) +void mtk_vcodec_enc_clock_off (struct mtk_vcodec_dev *dev, +enum mtk_venc_hw_id hw_id) { -struct mtk_vcodec_clk *enc_clk = &pm->venc_clk; +struct mtk_venc_hw_dev *sub_core; +struct mtk_vcodec_clk *enc_clk;int i =0 ; +if (hw_id ==MTK_VENC_CORE_0 ) { + enc_clk = &dev->pm.venc_clk; + }else if (hw_id ==MTK_VENC_CORE_1 ) { + sub_core = (struct mtk_venc_hw_dev *)dev->enc_hw_dev[hw_id]; + enc_clk = &sub_core->pm.venc_clk; + }else { +mtk_v4l2_err ("invalid hw id : %d" , hw_id); +return ; + } +for (i = enc_clk->clk_num -1 ; i >=0 ; i--) -clk_disable_unprepare (enc_clk->clk_info[i].vcodec_clk); +clk_disable (enc_clk->clk_info[i].vcodec_clk); }
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h +4 -2
@@ -14,7 +14,9 @@ int mtk_vcodec_init_enc_clk(struct platform_device *pdev,int mtk_vcodec_enc_power_on (struct mtk_vcodec_ctx *ctx);void mtk_vcodec_enc_power_off (struct mtk_vcodec_ctx *ctx); -void mtk_vcodec_enc_clock_on (struct mtk_vcodec_pm *pm); -void mtk_vcodec_enc_clock_off (struct mtk_vcodec_pm *pm); +void mtk_vcodec_enc_clock_on (struct mtk_vcodec_dev *dev, +enum mtk_venc_hw_id hw_id); +void mtk_vcodec_enc_clock_off (struct mtk_vcodec_dev *dev, +enum mtk_venc_hw_id hw_id);#endif /* _MTK_VCODEC_ENC_PM_H_ */
drivers/media/platform/mediatek/vcodec/venc_drv_if.c +2 -2
@@ -64,10 +64,10 @@ int venc_if_encode(struct mtk_vcodec_ctx *ctx, ctx->dev->curr_ctx = ctx;spin_unlock_irqrestore (&ctx->dev->irqlock, flags); -mtk_vcodec_enc_clock_on (&ctx->dev->pm); +mtk_vcodec_enc_clock_on (ctx->dev,0 ); ret = ctx->enc_if->encode (ctx->drv_handle, opt, frm_buf, bs_buf, result); -mtk_vcodec_enc_clock_off (&ctx->dev->pm); +mtk_vcodec_enc_clock_off (ctx->dev,0 );spin_lock_irqsave (&ctx->dev->irqlock, flags); ctx->dev->curr_ctx =NULL ;
Signature · 1 line
2.18.0
PATCH v5 7/8 media: mediatek: vcodec: Add multi-core encoding process
In reply to Irui WangMT8195 has two encoder hardware cores, when enable multi-core encoding, it is possiable to trying to use the two cores. According to hardware requirements, input frame 0 uses core0, frame 1 uses core1, then frame 2 uses core0, lock the device and enable clock by used core, and for sequence header encoding, it always use core0.
--- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 8 ++- .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 10 +-- .../platform/mediatek/vcodec/mtk_vcodec_enc.h | 4 +- .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 8 ++- .../mediatek/vcodec/mtk_vcodec_enc_hw.c | 7 +- .../mediatek/vcodec/mtk_vcodec_enc_hw.h | 2 - .../mediatek/vcodec/venc/venc_h264_if.c | 16 +++-- .../mediatek/vcodec/venc/venc_vp8_if.c | 3 +- .../platform/mediatek/vcodec/venc_drv_if.c | 69 ++++++++++++++----- .../platform/mediatek/vcodec/venc_drv_if.h | 4 ++ .../platform/mediatek/vcodec/venc_vpu_if.c | 9 ++- .../platform/mediatek/vcodec/venc_vpu_if.h | 3 +- 12 files changed, 100 insertions(+), 43 deletions(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +7 -1
@@ -289,6 +289,7 @@ struct vdec_pic_info {* @hw_id: hardware index used to identify different hardware. * * @msg_queue: msg queue used to store lat buffer information. +* @encoded_frame_cnt: number of encoded frames */ struct mtk_vcodec_ctx {enum mtk_instance_type type;
@@ -335,6 +336,8 @@ struct mtk_vcodec_ctx {int hw_id;struct vdec_msg_queue msg_queue; + +int encoded_frame_cnt; };/*
@@ -476,6 +479,7 @@ struct mtk_vcodec_enc_pdata {* @vdec_racing_info: record register value * @dec_racing_info_mutex: mutex lock used for inner racing mode * @enc_hw_dev: used to store venc core device +* @curr_enc_ctx: used to store current used enc context */ struct mtk_vcodec_dev {struct v4l2_device v4l2_dev;
@@ -509,7 +513,8 @@ struct mtk_vcodec_dev {/* decoder hardware mutex lock */ struct mutex dec_mutex[MTK_VDEC_HW_MAX ]; -struct mutex enc_mutex; +/* encoder hardware mutex lock */ +struct mutex enc_mutex[MTK_VENC_HW_MAX ];struct mtk_vcodec_pm pm;unsigned int dec_capability;
@@ -528,6 +533,7 @@ struct mtk_vcodec_dev {struct mutex dec_racing_info_mutex;void *enc_hw_dev[MTK_VENC_HW_MAX ]; +struct mtk_vcodec_ctx *curr_enc_ctx[MTK_VENC_HW_MAX ]; };static inline struct mtk_vcodec_ctx *fh_to_ctx (struct v4l2_fh *fh)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +6 -4
@@ -1240,6 +1240,8 @@ static void mtk_venc_worker(struct work_struct *work) enc_result.bs_size); } + ctx->encoded_frame_cnt++; +v4l2_m2m_job_finish (ctx->dev->m2m_dev_enc, ctx->m2m_ctx); mtk_v4l2_debug(1, "<=== src_buf[%d] dst_buf[%d] venc_if_encode ret=%d Size=%u===>",
@@ -1448,19 +1450,19 @@ int mtk_vcodec_enc_queue_init(void *priv, struct vb2_queue *src_vq,return vb2_queue_init (dst_vq); } -int mtk_venc_unlock (struct mtk_vcodec_ctx *ctx) +int mtk_venc_unlock (struct mtk_vcodec_ctx *ctx,int hw_id) {struct mtk_vcodec_dev *dev = ctx->dev; -mutex_unlock (&dev->enc_mutex); +mutex_unlock (&dev->enc_mutex[hw_id]);return 0 ; } -int mtk_venc_lock (struct mtk_vcodec_ctx *ctx) +int mtk_venc_lock (struct mtk_vcodec_ctx *ctx,int hw_id) {struct mtk_vcodec_dev *dev = ctx->dev; -mutex_lock (&dev->enc_mutex); +mutex_lock (&dev->enc_mutex[hw_id]);return 0 ; }
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.h +2 -2
@@ -39,8 +39,8 @@ struct mtk_video_enc_buf {extern const struct v4l2_ioctl_ops mtk_venc_ioctl_ops;extern const struct v4l2_m2m_ops mtk_venc_m2m_ops; -int mtk_venc_unlock (struct mtk_vcodec_ctx *ctx); -int mtk_venc_lock (struct mtk_vcodec_ctx *ctx); +int mtk_venc_unlock (struct mtk_vcodec_ctx *ctx,int hw_id); +int mtk_venc_lock (struct mtk_vcodec_ctx *ctx,int hw_id);int mtk_vcodec_enc_queue_init (void *priv,struct vb2_queue *src_vq,struct vb2_queue *dst_vq);void mtk_vcodec_enc_release (struct mtk_vcodec_ctx *ctx);
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +5 -3
@@ -91,7 +91,7 @@ static irqreturn_t mtk_vcodec_enc_irq_handler(int irq, void *priv)void __iomem *addr;spin_lock_irqsave (&dev->irqlock, flags); - ctx = dev->curr_ctx; + ctx = dev->curr_enc_ctx[MTK_VENC_CORE_0 ];spin_unlock_irqrestore (&dev->irqlock, flags);mtk_v4l2_debug (1 ,"id=%d coreid:%d" , ctx->id, dev->venc_pdata->core_id);
@@ -231,7 +231,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)struct resource *res;phandle rproc_phandle;enum mtk_vcodec_fw_type fw_type; -int ret; +int ret, i; dev =devm_kzalloc (&pdev->dev,sizeof (*dev),GFP_KERNEL );if (!dev)
@@ -298,7 +298,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev) goto err_res; } -mutex_init (&dev->enc_mutex); +for (i =0 ; i <MTK_VENC_HW_MAX ; i++) +mutex_init (&dev->enc_mutex[i]); +mutex_init (&dev->dev_mutex);spin_lock_init (&dev->irqlock);
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c +4 -3
@@ -46,13 +46,14 @@ static void clean_hw_irq_status(unsigned int irq_status, void __iomem *addr)static irqreturn_t mtk_enc_hw_irq_handler (int irq,void *priv) {struct mtk_venc_hw_dev *dev = priv; +struct mtk_vcodec_dev *main_dev = dev->main_dev;struct mtk_vcodec_ctx *ctx;unsigned long flags;void __iomem *addr; -spin_lock_irqsave (&dev->main_dev->irqlock, flags); - ctx = dev->curr_ctx; -spin_unlock_irqrestore (&dev->main_dev->irqlock, flags); +spin_lock_irqsave (&main_dev->irqlock, flags); + ctx = main_dev->curr_enc_ctx[dev->hw_id]; +spin_unlock_irqrestore (&main_dev->irqlock, flags);if (!ctx)return IRQ_HANDLED ;
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h +0 -2
@@ -14,7 +14,6 @@* @plat_dev: platform_device * @main_dev: main device * @pm: power management data -* @curr_ctx: the context that is waiting for venc hardware * @reg_base: mapped address of venc registers * @irq_status: venc hardware irq status * @enc_irq: venc device irq
@@ -25,7 +24,6 @@ struct mtk_venc_hw_dev {struct mtk_vcodec_dev *main_dev;struct mtk_vcodec_pm pm; -struct mtk_vcodec_ctx *curr_ctx;void __iomem *reg_base;unsigned int irq_status;
drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c +10 -6
@@ -454,7 +454,8 @@ static int h264_encode_sps(struct venc_h264_inst *inst,mtk_vcodec_debug_enter (inst); - ret =vpu_enc_encode (&inst->vpu_inst,H264_BS_MODE_SPS ,NULL , bs_buf,NULL ); + ret =vpu_enc_encode (&inst->vpu_inst,H264_BS_MODE_SPS ,NULL , + bs_buf,NULL ,MTK_VENC_CORE_0 );if (ret)return ret;
@@ -480,7 +481,8 @@ static int h264_encode_pps(struct venc_h264_inst *inst,mtk_vcodec_debug_enter (inst); - ret =vpu_enc_encode (&inst->vpu_inst,H264_BS_MODE_PPS ,NULL , bs_buf,NULL ); + ret =vpu_enc_encode (&inst->vpu_inst,H264_BS_MODE_PPS ,NULL , + bs_buf,NULL ,MTK_VENC_CORE_0 );if (ret)return ret;
@@ -522,7 +524,8 @@ static int h264_encode_header(struct venc_h264_inst *inst,static int h264_encode_frame (struct venc_h264_inst *inst,struct venc_frm_buf *frm_buf,struct mtk_vcodec_mem *bs_buf, -unsigned int *bs_size) +unsigned int *bs_size, +int hw_id) {struct venc_frame_info frame_info;struct mtk_vcodec_ctx *ctx = inst->ctx;
@@ -546,7 +549,8 @@ static int h264_encode_frame(struct venc_h264_inst *inst,mtk_vcodec_debug (inst,"frm_count = %d,skip_frm_count =%d,frm_type=%d.\n" , frame_info.frm_count, frame_info.skip_frm_count, frame_info.frm_type); - ret =vpu_enc_encode (&inst->vpu_inst,H264_BS_MODE_FRAME , frm_buf, bs_buf, &frame_info); + ret =vpu_enc_encode (&inst->vpu_inst,H264_BS_MODE_FRAME , frm_buf, + bs_buf, &frame_info, hw_id);if (ret)return ret;
@@ -674,7 +678,7 @@ static int h264_enc_encode(void *handle,if (!inst->prepend_hdr) { ret =h264_encode_frame (inst, frm_buf, bs_buf, - &result->bs_size); + &result->bs_size, ctx->hw_id);if (ret) goto encode_err; result->is_key_frm = inst->vpu_inst.is_key_frm;
@@ -702,7 +706,7 @@ static int h264_enc_encode(void *handle, tmp_bs_buf.size = bs_buf->size - (hdr_sz + filler_sz); ret =h264_encode_frame (inst, frm_buf, &tmp_bs_buf, - &bs_size_frm); + &bs_size_frm, ctx->hw_id);if (ret) goto encode_err;
drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c +2 -1
@@ -302,7 +302,8 @@ static int vp8_enc_encode_frame(struct venc_vp8_inst *inst,mtk_vcodec_debug (inst,"->frm_cnt=%d" , inst->frm_cnt); - ret =vpu_enc_encode (&inst->vpu_inst,0 , frm_buf, bs_buf,NULL ); + ret =vpu_enc_encode (&inst->vpu_inst,0 , frm_buf, + bs_buf,NULL ,MTK_VENC_CORE_0 );if (ret)return ret;
drivers/media/platform/mediatek/vcodec/venc_drv_if.c +50 -19
109 lines not on this page · raw message
drivers/media/platform/mediatek/vcodec/venc_drv_if.h +4 -0
@@ -167,4 +167,8 @@ int venc_if_encode(struct mtk_vcodec_ctx *ctx,struct mtk_vcodec_mem *bs_buf, struct venc_done_result *result); +void venc_encode_prepare (struct mtk_vcodec_ctx *ctx, +enum venc_start_opt opt); +void venc_encode_unprepare (struct mtk_vcodec_ctx *ctx, +enum venc_start_opt opt,int ret);#endif /* _VENC_DRV_IF_H_ */
drivers/media/platform/mediatek/vcodec/venc_vpu_if.c +8 -1
@@ -225,7 +225,8 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu,int vpu_enc_encode (struct venc_vpu_inst *vpu,unsigned int bs_mode,struct venc_frm_buf *frm_buf,struct mtk_vcodec_mem *bs_buf, -struct venc_frame_info *frame_info) +struct venc_frame_info *frame_info, +int hw_id) {const bool is_ext =MTK_ENC_CTX_IS_EXT (vpu->ctx); size_t msg_size = is_ext ?
@@ -261,6 +262,12 @@ int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode, out.data[1 ] = frame_info->skip_frm_count; out.data[2 ] = frame_info->frm_type; } + +if (IS_VENC_MULTICORE (vpu->ctx->dev->enc_capability)) { + out.data_item =4 ; + out.data[3 ] = hw_id; + } +if (vpu_enc_send_msg (vpu, &out, msg_size)) {mtk_vcodec_err (vpu,"AP_IPIMSG_ENC_ENCODE %d fail" , bs_mode);
drivers/media/platform/mediatek/vcodec/venc_vpu_if.h +2 -1
@@ -45,7 +45,8 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu,int vpu_enc_encode (struct venc_vpu_inst *vpu,unsigned int bs_mode,struct venc_frm_buf *frm_buf,struct mtk_vcodec_mem *bs_buf, -struct venc_frame_info *frame_info); +struct venc_frame_info *frame_info, +int hw_id);int vpu_enc_deinit (struct venc_vpu_inst *vpu);#endif
Signature · 1 line
2.18.0
PATCH v5 8/8 media: mediatek: vcodec: Return encoding result in asynchronous mode
In reply to Irui Wangwhen enable multi-core encoding, the wait IRQ done synchronous function should not be called, so the encoding result can't return to client in device_run. Move the buffer done function in IRQ handler.
--- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 6 ++ .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 72 +++++++++++++++++-- .../platform/mediatek/vcodec/mtk_vcodec_enc.h | 7 +- .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 28 +++++++- .../mediatek/vcodec/mtk_vcodec_enc_hw.c | 13 +++- .../mediatek/vcodec/mtk_vcodec_enc_pm.c | 1 + .../mediatek/vcodec/mtk_vcodec_util.h | 1 + .../mediatek/vcodec/venc/venc_h264_if.c | 20 ++++-- .../platform/mediatek/vcodec/venc_drv_if.h | 2 + 9 files changed, 137 insertions(+), 13 deletions(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +6 -0
@@ -290,6 +290,9 @@ struct vdec_pic_info {* * @msg_queue: msg queue used to store lat buffer information. * @encoded_frame_cnt: number of encoded frames +* @pfrm_buf: used to store current ctx's frame buffer +* @pbs_buf: used to store current ctx's bitstream buffer +* @hdr_size: used to store prepend header size */ struct mtk_vcodec_ctx {enum mtk_instance_type type;
@@ -338,6 +341,9 @@ struct mtk_vcodec_ctx {struct vdec_msg_queue msg_queue;int encoded_frame_cnt; +struct vb2_v4l2_buffer *pfrm_buf[MTK_VENC_HW_MAX ]; +struct vb2_v4l2_buffer *pbs_buf[MTK_VENC_HW_MAX ]; +unsigned int hdr_size; };/*
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +67 -5
117 lines not on this page · raw message
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.h +6 -1
@@ -20,6 +20,9 @@#define MTK_VENC_IRQ_STATUS_OFFSET 0x05C#define MTK_VENC_IRQ_ACK_OFFSET 0x060 +#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098 +#define VENC_PIC_FRM_TYPE 0x0010 +#define VENC_PIC_KEY_FRM 0x2/** * struct mtk_video_enc_buf - Private data related to each VB2 buffer.
@@ -46,5 +49,7 @@ int mtk_vcodec_enc_queue_init(void *priv, struct vb2_queue *src_vq,void mtk_vcodec_enc_release (struct mtk_vcodec_ctx *ctx);int mtk_vcodec_enc_ctrls_setup (struct mtk_vcodec_ctx *ctx);void mtk_vcodec_enc_set_default_params (struct mtk_vcodec_ctx *ctx); - +void mtk_venc_buf_done (struct mtk_vcodec_ctx *ctx,int hw_id, +unsigned int bs_size,bool time_out,bool key_frame); +void mtk_venc_lock_all (struct mtk_vcodec_ctx *ctx);#endif /* _MTK_VCODEC_ENC_H_ */
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +27 -1
@@ -89,6 +89,9 @@ static irqreturn_t mtk_vcodec_enc_irq_handler(int irq, void *priv)struct mtk_vcodec_ctx *ctx;unsigned long flags;void __iomem *addr; +unsigned int bs_size; +unsigned int frm_type; +bool is_key_frame =0 ;spin_lock_irqsave (&dev->irqlock, flags); ctx = dev->curr_enc_ctx[MTK_VENC_CORE_0 ];
@@ -101,8 +104,32 @@ static irqreturn_t mtk_vcodec_enc_irq_handler(int irq, void *priv) ctx->irq_status =readl (dev->reg_base[dev->venc_pdata->core_id] + (MTK_VENC_IRQ_STATUS_OFFSET )); + bs_size =readl (dev->reg_base[dev->venc_pdata->core_id] + + (VENC_PIC_BITSTREAM_BYTE_CNT )); + frm_type =readl (dev->reg_base[dev->venc_pdata->core_id] + + (VENC_PIC_FRM_TYPE )); +clean_irq_status (ctx->irq_status, addr); +if (IS_VENC_MULTICORE (dev->enc_capability)) { +if (ctx->irq_status &MTK_VENC_IRQ_STATUS_FRM ) { +if (ctx->hdr_size !=0 ) { + bs_size += ctx->hdr_size; + ctx->hdr_size =0 ; + } + +if (frm_type &VENC_PIC_KEY_FRM ) + is_key_frame =1 ; + +mtk_venc_buf_done (ctx,0 , bs_size,0 , is_key_frame); +mtk_vcodec_enc_clock_off (dev,0 ); +mtk_venc_unlock (ctx,0 ); + }else { +wake_up_ctx (ctx,MTK_INST_IRQ_RECEIVED ,0 ); + } +return IRQ_HANDLED ; + } +wake_up_ctx (ctx,MTK_INST_IRQ_RECEIVED ,0 );return IRQ_HANDLED ; }
@@ -286,7 +313,6 @@ static int mtk_vcodec_probe(struct platform_device *pdev) } dev->enc_irq =platform_get_irq (pdev,0 ); -irq_set_status_flags (dev->enc_irq,IRQ_NOAUTOEN ); ret =devm_request_irq (&pdev->dev, dev->enc_irq, mtk_vcodec_enc_irq_handler,0 , pdev->name, dev);
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c +12 -1
@@ -50,6 +50,9 @@ static irqreturn_t mtk_enc_hw_irq_handler(int irq, void *priv)struct mtk_vcodec_ctx *ctx;unsigned long flags;void __iomem *addr; +unsigned int bs_size; +unsigned int frm_type; +bool is_key_frame =0 ;spin_lock_irqsave (&main_dev->irqlock, flags); ctx = main_dev->curr_enc_ctx[dev->hw_id];
@@ -61,9 +64,17 @@ static irqreturn_t mtk_enc_hw_irq_handler(int irq, void *priv) addr = dev->reg_base +MTK_VENC_IRQ_ACK_OFFSET ; ctx->irq_status =readl (dev->reg_base +MTK_VENC_IRQ_STATUS_OFFSET ); + bs_size =readl (dev->reg_base +VENC_PIC_BITSTREAM_BYTE_CNT ); + frm_type =readl (dev->reg_base +VENC_PIC_FRM_TYPE );clean_hw_irq_status (ctx->irq_status, addr); -wake_up_ctx (ctx,MTK_INST_IRQ_RECEIVED ,0 ); +if (frm_type &VENC_PIC_KEY_FRM ) + is_key_frame =1 ; + +mtk_venc_buf_done (ctx, dev->hw_id, bs_size,0 , is_key_frame); +mtk_vcodec_enc_clock_off (main_dev, dev->hw_id); +mtk_venc_unlock (ctx, dev->hw_id); +return IRQ_HANDLED ; }
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c +1 -0
@@ -235,3 +235,4 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_dev *dev,for (i = enc_clk->clk_num -1 ; i >=0 ; i--)clk_disable (enc_clk->clk_info[i].vcodec_clk); } +EXPORT_SYMBOL_GPL (mtk_vcodec_enc_clock_off);
drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h +1 -0
@@ -15,6 +15,7 @@ struct mtk_vcodec_mem {size_t size;void *va;dma_addr_t dma_addr; +void *buf; };struct mtk_vcodec_fb {
drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c +15 -5
@@ -22,7 +22,6 @@static const char h264_filler_marker[] = {0x0 ,0x0 ,0x0 ,0x1 ,0xc };#define H264_FILLER_MARKER_SIZE ARRAY_SIZE(h264_filler_marker) -#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098/* * enum venc_h264_frame_type - h264 encoder output bitstream frame type
@@ -568,6 +567,11 @@ static int h264_encode_frame(struct venc_h264_inst *inst,return ret; } +if (IS_VENC_MULTICORE (ctx->dev->enc_capability)) { + ++inst->frm_cnt; +return ret; + } + irq_status =h264_enc_wait_venc_done (inst);if (irq_status !=MTK_VENC_IRQ_STATUS_FRM ) {mtk_vcodec_err (inst,"irq_status=%d failed" , irq_status);
@@ -652,8 +656,6 @@ static int h264_enc_encode(void *handle,mtk_vcodec_debug (inst,"opt %d ->" , opt); -enable_irq (ctx->dev->enc_irq); -switch (opt) {case VENC_START_OPT_ENCODE_SEQUENCE_HEADER : {unsigned int bs_size_hdr;
@@ -676,6 +678,13 @@ static int h264_enc_encode(void *handle,unsigned int bs_size_hdr;unsigned int bs_size_frm; +/* +* the frm_buf and bs_buf need to recorded into current ctx, +* when encoding done, the target buffers can be got from ctx. +*/ + ctx->pfrm_buf[ctx->hw_id] = frm_buf->frm_addr; + ctx->pbs_buf[ctx->hw_id] = bs_buf->buf; +if (!inst->prepend_hdr) { ret =h264_encode_frame (inst, frm_buf, bs_buf, &result->bs_size, ctx->hw_id);
@@ -710,7 +719,9 @@ static int h264_enc_encode(void *handle,if (ret) goto encode_err; - result->bs_size = hdr_sz + filler_sz + bs_size_frm; + ctx->hdr_size = hdr_sz + filler_sz; + + result->bs_size = ctx->hdr_size + bs_size_frm; mtk_vcodec_debug(inst, "hdr %d filler %d frame %d bs %d", hdr_sz, filler_sz, bs_size_frm,
@@ -729,7 +740,6 @@ static int h264_enc_encode(void *handle, encode_err: -disable_irq (ctx->dev->enc_irq);mtk_vcodec_debug (inst,"opt %d <-" , opt);return ret;
drivers/media/platform/mediatek/vcodec/venc_drv_if.h +2 -0
@@ -108,9 +108,11 @@ struct venc_frame_info {/* * struct venc_frm_buf - frame buffer information used in venc_if_encode() * @fb_addr: plane frame buffer addresses +* @frm_addr: current v4l2 buffer address */ struct venc_frm_buf {struct mtk_vcodec_fb fb_addr[MTK_VCODEC_MAX_PLANES ]; +void *frm_addr; };/*
Signature · 1 line
2.18.0
Hi Irui,
Le vendredi 29 juillet 2022 à 11:51 +0800, Irui Wang a écrit :
Quoted 3 lines
MT8195 has two H264 encoder hardware, named core0 and core1, this two cores can encode two input frames separately at the same time to achieve higher performance.
I suspect you could provide some performance numbers on that specific HW before and after your change ? This could help integrator regarding what type of gain they can expect of back-porting this feature. This is not strictly mandatory though.
Quoted 78 lines
This series of patches are used to enable the two H264 encoder cores, the difference between encoding process before and after enable two cores is just like as below:
As-Is: Synchronous
V4L2_VIDIOC_QBUF#0 -->device_run(triger encoder)--> wait encoder IRQ -->
encoding done with result -->job_finish
V4l2_VIDIOC_QBUF#1 -->device_run(triger encoder)--> wait encoder IRQ -->
encoding done with result -->job_finish
...
To-Be: Asynchronous
V4L2_VIDIOC_QBUF#0 -->device_run(triger encoder)-->job_finish..V4l2_VIDIOC_QBUF#1 -->device_run(triger encoder)-->job_finish(venc core0 may encode done here, done the encoding result to client) V4L2_VIDIOC_QBUF#2 -->device_run(triger encoder)-->job_finish.---
changes compared with v4:
- reabse to the newer linux media stage tree.
- remove "mediatek,venc-multi-core" property since sub-device can be probed byof_platform_populateapi directly.
- some modifications for patch v4's review comments.changes compared with v3:
- rebase to the newer linux media stage.
- add a capability to indicate scp firmware support multi-core.
- probe core0 as main device, core1 as sub-device.changes compared with v2:
- update venc core dt-bindings, add two new properties for current usage.
- parse vencmulti_coremode from device tree.
- rebase to the newer linux media stage.changes compared with v1:
-of_platform_populatewas used in place of the component framework.
- new yaml file for venc cores.
- some modifications for patch v1's review comments.
---Irui Wang (8):
dt-bindings: media: mediatek: vcodec: Adds encoder cores dt-bindingsfor mt8195media: mediatek: vcodec: Enable venc dual core usage
media: mediatek: vcodec: Refactor venc power manage function
media: mediatek: vcodec: Add more extra processing for multi-core
encoding
media: mediatek: vcodec: Add venc power on/off function
media: mediatek: vcodec: Refactor encoder clock on/off function
media: mediatek: vcodec: Add multi-core encoding process
media: mediatek: vcodec: Return encoding result in asynchronous mode.../media/mediatek,vcodec-encoder-core.yaml | 218 ++++++++++++++++ .../media/mediatek,vcodec-encoder.yaml | 1 - .../media/platform/mediatek/vcodec/Makefile | 4 +- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 28 +- .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 113 ++++++-- .../platform/mediatek/vcodec/mtk_vcodec_enc.h | 11 +- .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 44 +++- .../mediatek/vcodec/mtk_vcodec_enc_hw.c | 156 +++++++++++ .../mediatek/vcodec/mtk_vcodec_enc_hw.h | 34 +++ .../mediatek/vcodec/mtk_vcodec_enc_pm.c | 178 +++++++++++-- .../mediatek/vcodec/mtk_vcodec_enc_pm.h | 11 +- .../mediatek/vcodec/mtk_vcodec_util.c | 19 ++ .../mediatek/vcodec/mtk_vcodec_util.h | 3 + .../mediatek/vcodec/venc/venc_h264_if.c | 243 ++++++++++++++---- .../mediatek/vcodec/venc/venc_vp8_if.c | 3 +- .../platform/mediatek/vcodec/venc_drv_if.c | 75 ++++-- .../platform/mediatek/vcodec/venc_drv_if.h | 6 + .../platform/mediatek/vcodec/venc_vpu_if.c | 9 +- .../platform/mediatek/vcodec/venc_vpu_if.h | 3 +- 19 files changed, 1028 insertions(+), 131 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-encoder-core.yaml create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h
Dear Nicolas,
Sorry for late, we have tested this change by chrome tast test before:
tast run $IP video.PlatformEncoding.v4l2_h264*
here are the average fps results:
Before:
180p: 1913
180_meet: 1935
360p: 554
360_meet: 571
720p: 159
720_meet: 189
After:
180p: 2236
180_meet: 2337
360p: 820
360_meet: 830
720p: 324
720_meet: 390
Thanks
BRs
Quoted 110 lines · Nicolas Dufresne
Hi Irui,
Quoted 5 lines · Irui Wang
MT8195 has two H264 encoder hardware, named core0 and core1, this two
cores can encode two input frames separately at the same time to achieve
higher performance.I suspect you could provide some performance numbers on that specific HW before
and after your change ? This could help integrator regarding what type of gain
they can expect of back-porting this feature. This is not strictly mandatory
though.Quoted 91 lines
This series of patches are used to enable the two H264 encoder cores,
the difference between encoding process before and after enable two cores is just like as below:
As-Is: Synchronous
V4L2_VIDIOC_QBUF#0 -->device_run(triger encoder)--> wait encoder IRQ
-->
encoding done with result -->job_finishV4l2_VIDIOC_QBUF#1 -->device_run(triger encoder)--> wait encoder IRQ
-->
encoding done with result -->job_finish
...
To-Be: Asynchronous
V4L2_VIDIOC_QBUF#0 -->device_run(triger encoder)-->job_finish..V4l2_VIDIOC_QBUF#1 -->device_run(triger encoder)-->job_finish(venc core0 may encode done here, done the encoding result to client)
V4L2_VIDIOC_QBUF#2 -->device_run(triger encoder)-->job_finish.---
changes compared with v4:
- reabse to the newer linux media stage tree.
- remove "mediatek,venc-multi-core" property since sub-device can be probed byof_platform_populateapi directly.
- some modifications for patch v4's review comments.changes compared with v3:
- rebase to the newer linux media stage.
- add a capability to indicate scp firmware support multi-core.
- probe core0 as main device, core1 as sub-device.changes compared with v2:
- update venc core dt-bindings, add two new properties for current usage.
- parse vencmulti_coremode from device tree.
- rebase to the newer linux media stage.changes compared with v1:
-of_platform_populatewas used in place of the component framework.
- new yaml file for venc cores.
- some modifications for patch v1's review comments.
---Irui Wang (8):
dt-bindings: media: mediatek: vcodec: Adds encoder cores dt-
bindingsfor mt8195media: mediatek: vcodec: Enable venc dual core usage
media: mediatek: vcodec: Refactor venc power manage function
media: mediatek: vcodec: Add more extra processing for multi-core
encoding
media: mediatek: vcodec: Add venc power on/off function
media: mediatek: vcodec: Refactor encoder clock on/off function
media: mediatek: vcodec: Add multi-core encoding process
media: mediatek: vcodec: Return encoding result in asynchronous
mode.../media/mediatek,vcodec-encoder-core.yaml | 218 ++++++++++++++++ .../media/mediatek,vcodec-encoder.yaml | 1 - .../media/platform/mediatek/vcodec/Makefile | 4 +- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 28 +- .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 113 ++++++-- .../platform/mediatek/vcodec/mtk_vcodec_enc.h | 11 +- .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 44 +++- .../mediatek/vcodec/mtk_vcodec_enc_hw.c | 156 +++++++++++ .../mediatek/vcodec/mtk_vcodec_enc_hw.h | 34 +++ .../mediatek/vcodec/mtk_vcodec_enc_pm.c | 178 +++++++++++-- .../mediatek/vcodec/mtk_vcodec_enc_pm.h | 11 +- .../mediatek/vcodec/mtk_vcodec_util.c | 19 ++ .../mediatek/vcodec/mtk_vcodec_util.h | 3 + .../mediatek/vcodec/venc/venc_h264_if.c | 243 ++++++++++++++---- .../mediatek/vcodec/venc/venc_vp8_if.c | 3 +- .../platform/mediatek/vcodec/venc_drv_if.c | 75 ++++-- .../platform/mediatek/vcodec/venc_drv_if.h | 6 + .../platform/mediatek/vcodec/venc_vpu_if.c | 9 +- .../platform/mediatek/vcodec/venc_vpu_if.h | 3 +- 19 files changed, 1028 insertions(+), 131 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-encoder- core.yaml create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c create mode 100644
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h