Add support for MT8196 video encoder
Subsystems (4)
v6 cover Add support for MT8196 video encoder
This patch series add support for MT8196 video encoder. patch 1: Add dt-bindings.
patch 2~4: Add a new encoder driver interface for new VCP firmware. patch 5: Add new encoder driver platform data.
patch 6: Add compatible data.
About adding new driver support, the v4l2-compliance report shows:
"Total for mtk-vcodec-enc device /dev/video3: 47, Succeeded: 46, Failed: 1, Warnings: 0" The 1 Failed case is not caused by current patch set:
fail: v4l2-test-controls.cpp(1171): node->codec_mask & STATEFUL_ENCODER
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: FAIL
This patch set depends on "media: mediatek: vcodec: support video decoder in mt8196"[1]
[1] https://patchwork.linuxtv.org/project/linux-media/list/?series=23518
Change in v6:
- Move dt-bindings to patch 1.
- Rebase patch onto decoder's patch set.
- Link to v5: https://patchwork.linuxtv.org/project/linux-media/cover/[email protected]/
Change in v5:
- Rewrite patch5 commit subject.
- Add else statement in patch5.
- Link to v4: https://patchwork.linuxtv.org/project/linux-media/list/?series=21757
Change in v4:
- Rework patch3 commit message.
- Rework patch5 commit with more details.
- Rebase patch onto decoder's patch set.
- Link to v3: https://patchwork.linuxtv.org/project/linux-media/cover/[email protected]/
Change in v3:
- Add venc rc buffer alloc failure error handling.
- Add mediatek,vcp property definition in dt-bindning.
Change in v2:
- Add support for VCP encode process.
- Add MT8196 encoder driver platform data.
- Rebase encoder patch onto decoder's patch set.
- Fix some review comments in v1.
Irui Wang (6):
media: dt-bindings: mediatek,vcodec-encoder: Add MT8196
media: mediatek: encoder: Add a new encoder driver interface
media: mediatek: encoder: Add support for common firmware interface
media: mediatek: encoder: Add support for VCP encode process
media: mediatek: encoder: Add a new platform data member
media: mediatek: encoder: Add MT8196 encoder compatible data
.../media/mediatek,vcodec-encoder.yaml | 22 + .../mediatek/vcodec/common/mtk_vcodec_fw.c | 19 + .../mediatek/vcodec/common/mtk_vcodec_fw.h | 2 + .../vcodec/common/mtk_vcodec_fw_priv.h | 1 + .../vcodec/common/mtk_vcodec_fw_vcp.c | 6 + .../platform/mediatek/vcodec/encoder/Makefile | 1 + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 36 +- .../vcodec/encoder/mtk_vcodec_enc_drv.c | 28 + .../vcodec/encoder/mtk_vcodec_enc_drv.h | 15 +- .../vcodec/encoder/venc/venc_common_if.c | 685 ++++++++++++++++++ .../vcodec/encoder/venc/venc_h264_if.c | 8 +- .../mediatek/vcodec/encoder/venc_drv_if.c | 3 +- .../mediatek/vcodec/encoder/venc_drv_if.h | 11 +- .../mediatek/vcodec/encoder/venc_ipi_msg.h | 26 + .../mediatek/vcodec/encoder/venc_vpu_if.c | 47 +- 15 files changed, 858 insertions(+), 52 deletions(-) create mode 100644 drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c
Signature · 1 line
2.45.2
PATCH v6 1/6 media: dt-bindings: mediatek,vcodec-encoder: Add MT8196
Add support for MT8196 video encoder which uses VCP (Video Co-Processor) for firmware management. Unlike previous platforms that use SCP/VPU, MT8196 requires VCP to load and execute the video encoding firmware, with the encoder communicating through VCP to perform encoding operations.
Add the "mediatek,mt8196-vcodec-enc" compatible string and introduce the "mediatek,vcp" property to reference the VCP device, which is required for MT8196 encoder operation.
--- .../media/mediatek,vcodec-encoder.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +22 -0
@@ -24,6 +24,7 @@ properties: - mediatek,mt8188-vcodec-enc - mediatek,mt8192-vcodec-enc - mediatek,mt8195-vcodec-enc + - mediatek,mt8196-vcodec-enc - items: - const: mediatek,mt8186-vcodec-enc - const: mediatek,mt8183-vcodec-enc
@@ -58,6 +59,13 @@ properties: description: Describes point to scp. + mediatek,vcp: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Reference to the VCP (Video Co-Processor) device that loads and executes + the video encoding firmware. The encoder communicates with the firmware + through VCP to perform encoding operations. + power-domains: maxItems: 1
@@ -76,6 +84,20 @@ required: - iommus allOf: + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt8196-vcodec-enc + + then: + required: + - mediatek,vcp + else: + properties: + mediatek,vcp: false + - if: properties: compatible:
Signature · 1 line
2.45.2
PATCH v6 2/6 media: mediatek: encoder: Add a new encoder driver interface
In reply to Irui WangIntroduce a new encoder kernel driver interface to ensure compatibility with the updated encoder software driver running in firmware. The new driver interface is expected to support more encoder formats, share more encode parameters between kernel and firmware.
--- .../mediatek/vcodec/common/mtk_vcodec_fw.c | 13 + .../mediatek/vcodec/common/mtk_vcodec_fw.h | 1 + .../platform/mediatek/vcodec/encoder/Makefile | 1 + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 14 +- .../vcodec/encoder/mtk_vcodec_enc_drv.h | 8 +- .../vcodec/encoder/venc/venc_common_if.c | 674 ++++++++++++++++++ .../vcodec/encoder/venc/venc_h264_if.c | 8 +- .../mediatek/vcodec/encoder/venc_drv_if.h | 11 +- 8 files changed, 712 insertions(+), 18 deletions(-) create mode 100644 drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c +13 -0
@@ -18,6 +18,19 @@ int mtk_vcodec_fw_get_ipi(enum mtk_vcodec_fw_type type, int hw_id) }EXPORT_SYMBOL_GPL (mtk_vcodec_fw_get_ipi); +int mtk_vcodec_fw_get_venc_ipi (enum mtk_vcodec_fw_type type) +{ +switch (type) { +case SCP : +return SCP_IPI_VENC_H264 ; +case VCP : +return VCP_IPI_ENCODER ; +default : +return -EINVAL ; + } +} +EXPORT_SYMBOL_GPL (mtk_vcodec_fw_get_venc_ipi); +struct mtk_vcodec_fw *mtk_vcodec_fw_select (void *priv,enum mtk_vcodec_fw_type type,enum mtk_vcodec_fw_use fw_use) {
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +1 -0
@@ -42,5 +42,6 @@ int mtk_vcodec_fw_ipi_send(struct mtk_vcodec_fw *fw, int id, void *buf, unsigned int len, unsigned int wait);int mtk_vcodec_fw_get_type (struct mtk_vcodec_fw *fw);int mtk_vcodec_fw_get_ipi (enum mtk_vcodec_fw_type type,int hw_id); +int mtk_vcodec_fw_get_venc_ipi (enum mtk_vcodec_fw_type type);#endif /* _MTK_VCODEC_FW_H_ */
drivers/media/platform/mediatek/vcodec/encoder/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-enc.o mtk-vcodec-enc-y := venc/venc_vp8_if.o \ venc/venc_h264_if.o \ + venc/venc_common_if.o \ mtk_vcodec_enc.o \ mtk_vcodec_enc_drv.o \ mtk_vcodec_enc_pm.o \
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +8 -6
@@ -81,11 +81,11 @@ static int vidioc_venc_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_H264_PROFILE :mtk_v4l2_venc_dbg (2 , ctx,"V4L2_CID_MPEG_VIDEO_H264_PROFILE val = %d" , ctrl->val); - p->h264_profile = ctrl->val; + p->profile = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LEVEL :mtk_v4l2_venc_dbg (2 , ctx,"V4L2_CID_MPEG_VIDEO_H264_LEVEL val = %d" , ctrl->val); - p->h264_level = ctrl->val; + p->level = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_I_PERIOD :mtk_v4l2_venc_dbg (2 , ctx,"V4L2_CID_MPEG_VIDEO_H264_I_PERIOD val = %d" , ctrl->val);
@@ -385,8 +385,8 @@ static void mtk_venc_set_param(struct mtk_vcodec_enc_ctx *ctx,mtk_v4l2_venc_err (ctx,"Unsupported fourcc =%d" , q_data_src->fmt->fourcc);break ; } - param->h264_profile = enc_params->h264_profile; - param->h264_level = enc_params->h264_level; + param->profile = enc_params->profile; + param->level = enc_params->level;/* Config visible resolution */ param->width = q_data_src->visible_width;
@@ -402,8 +402,8 @@ static void mtk_venc_set_param(struct mtk_vcodec_enc_ctx *ctx,mtk_v4l2_venc_dbg (0 , ctx,"fmt 0x%x, P/L %d/%d w/h %d/%d buf %d/%d fps/bps %d/%d gop %d i_per %d" , - param->input_yuv_fmt, param->h264_profile, - param->h264_level, param->width, param->height, + param->input_yuv_fmt, param->profile, + param->level, param->width, param->height, param->buf_width, param->buf_height, param->frm_rate, param->bitrate, param->gop_size, param->intra_period);
@@ -1157,6 +1157,8 @@ static void mtk_venc_worker(struct work_struct *work) frm_buf.fb_addr[i].size = (size_t )src_buf->vb2_buf.planes[i].length; } + frm_buf.num_planes = src_buf->vb2_buf.num_planes; + bs_buf.va =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); bs_buf.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 ); bs_buf.size = (size_t )dst_buf->vb2_buf.planes[0 ].length;
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h +4 -4
@@ -69,8 +69,8 @@ enum mtk_encode_param {* @framerate_denom: frame rate denominator. ex: framerate_num=30 and * framerate_denom=1 means FPS is 30 * @h264_max_qp: Max value for H.264 quantization parameter -* @h264_profile: V4L2 defined H.264 profile -* @h264_level: V4L2 defined H.264 level +* @profile: V4L2 defined profile +* @level: V4L2 defined level * @force_intra: force/insert intra frame */ struct mtk_enc_params {
@@ -84,8 +84,8 @@ struct mtk_enc_params {unsigned int framerate_num;unsigned int framerate_denom;unsigned int h264_max_qp; -unsigned int h264_profile; -unsigned int h264_level; +unsigned int profile; +unsigned int level;unsigned int force_intra; };
drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c new file +674 -0
674 lines not on this page · raw message
drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c +4 -4
@@ -723,9 +723,9 @@ static void h264_enc_set_vsi_configs(struct venc_h264_inst *inst, inst->vsi->config.framerate = enc_prm->frm_rate; inst->vsi->config.intra_period = enc_prm->intra_period; inst->vsi->config.profile = -h264_get_profile (inst, enc_prm->h264_profile); +h264_get_profile (inst, enc_prm->profile); inst->vsi->config.level = -h264_get_level (inst, enc_prm->h264_level); +h264_get_level (inst, enc_prm->level); inst->vsi->config.wfd =0 ; }
@@ -742,9 +742,9 @@ static void h264_enc_set_vsi_34_configs(struct venc_h264_inst *inst, inst->vsi_34->config.framerate = enc_prm->frm_rate; inst->vsi_34->config.intra_period = enc_prm->intra_period; inst->vsi_34->config.profile = -h264_get_profile (inst, enc_prm->h264_profile); +h264_get_profile (inst, enc_prm->profile); inst->vsi_34->config.level = -h264_get_level (inst, enc_prm->h264_level); +h264_get_level (inst, enc_prm->level); inst->vsi_34->config.wfd =0 ; }
drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.h +7 -4
@@ -66,8 +66,8 @@ enum venc_set_param_type {* struct venc_enc_prm - encoder settings for VENC_SET_PARAM_ENC used in * venc_if_set_param() * @input_fourcc: input yuv format -* @h264_profile: V4L2 defined H.264 profile -* @h264_level: V4L2 defined H.264 level +* @profile: V4L2 defined profile +* @level: V4L2 defined level * @width: image width * @height: image height * @buf_width: buffer width
@@ -79,8 +79,8 @@ enum venc_set_param_type {*/ struct venc_enc_param {enum venc_yuv_fmt input_yuv_fmt; -unsigned int h264_profile; -unsigned int h264_level; +unsigned int profile; +unsigned int level;unsigned int width;unsigned int height;unsigned int buf_width;
@@ -107,9 +107,11 @@ struct venc_frame_info {/* * struct venc_frm_buf - frame buffer information used in venc_if_encode() * @fb_addr: plane frame buffer addresses +* @num_planes: number of planes */ struct venc_frm_buf {struct mtk_vcodec_fb fb_addr[MTK_VCODEC_MAX_PLANES ]; +unsigned int num_planes; };/*
@@ -124,6 +126,7 @@ struct venc_done_result {extern const struct venc_common_if venc_h264_if;extern const struct venc_common_if venc_vp8_if; +extern const struct venc_common_if venc_if;/* * venc_if_init - Create the driver handle
Signature · 1 line
2.45.2
Re: [PATCH v6 2/6] media: mediatek: encoder: Add a new encoder driver interface
Le jeudi 23 avril 2026 à 15:33 +0800, Irui Wang a écrit :
Quoted 27 lines
Introduce a new encoder kernel driver interface to ensure compatibility with the updated encoder software driver running in firmware. The new driver interface is expected to support more encoder formats, share more encode parameters between kernel and firmware.
Signed-off-by Irui Wang <[email protected]>Reviewed-by Nicolas Dufresne <[email protected]>---
.../mediatek/vcodec/common/mtk_vcodec_fw.c | 13 + .../mediatek/vcodec/common/mtk_vcodec_fw.h | 1 + .../platform/mediatek/vcodec/encoder/Makefile | 1 + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 14 +- .../vcodec/encoder/mtk_vcodec_enc_drv.h | 8 +- .../vcodec/encoder/venc/venc_common_if.c | 674 ++++++++++++++++++ .../vcodec/encoder/venc/venc_h264_if.c | 8 +- .../mediatek/vcodec/encoder/venc_drv_if.h | 11 +-8 files changed, 712 insertions(+), 18 deletions(-)create mode 100644
drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.cdrivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c +0
-0@@ -18,6 +18,19 @@ int mtk_vcodec_fw_get_ipi(enum mtk_vcodec_fw_type type, int hw_id) } EXPORT_SYMBOL_GPL(mtk_vcodec_fw_get_ipi);
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c int mtk_vcodec_fw_get_ipi(enum mtk_vcodec_fw_type type, int hw_id) · line 30
Quoted 10 lines
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c +10
-0+int mtk_vcodec_fw_get_venc_ipi (enum mtk_vcodec_fw_type type) +{ +switch (type) { +case SCP : +return SCP_IPI_VENC_H264 ; +case VCP : +return VCP_IPI_ENCODER ; +default : +return -EINVAL ; + }
I would prefer to see this placed inside the venc_pdata instead.
Nicolas
Quoted 858 lines
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c +3
-0+} +EXPORT_SYMBOL_GPL (mtk_vcodec_fw_get_venc_ipi); +struct
mtk_vcodec_fw*mtk_vcodec_fw_select(void *priv, enummtk_vcodec_fw_typetype, enummtk_vcodec_fw_usefw_use) {drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +1
-0@@ -42,5 +42,6 @@ int mtk_vcodec_fw_ipi_send(struct mtk_vcodec_fw *fw, int id, void *buf, unsigned int len, unsigned int wait); int mtk_vcodec_fw_get_type(struct mtk_vcodec_fw *fw); int mtk_vcodec_fw_get_ipi(enum mtk_vcodec_fw_type type, int hw_id); +int mtk_vcodec_fw_get_venc_ipi (enum mtk_vcodec_fw_type type);
#endif /* _MTK_VCODEC_FW_H_ */drivers/media/platform/mediatek/vcodec/encoder/Makefile +0
-0@@ -4,6 +4,7 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-enc.o
mtk-vcodec-enc-y :=venc/venc_vp8_if.o\
venc/venc_h264_if.o\drivers/media/platform/mediatek/vcodec/encoder/Makefile +1
-0+ venc/venc_common_if.o \mtk_vcodec_enc.o \
mtk_vcodec_enc_drv.o \
mtk_vcodec_enc_pm.o \drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0@@ -81,11 +81,11 @@ static int vidioc_venc_s_ctrl(struct v4l2_ctrl *ctrl) break;case
V4L2_CID_MPEG_VIDEO_H264_PROFILE:
mtk_v4l2_venc_dbg(2, ctx, "V4L2_CID_MPEG_VIDEO_H264_PROFILE val = %d", ctrl->val);drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +1
-1- p->h264_profile = ctrl->val; + p->profile = ctrl->val;break;
caseV4L2_CID_MPEG_VIDEO_H264_LEVEL:
mtk_v4l2_venc_dbg(2, ctx, "V4L2_CID_MPEG_VIDEO_H264_LEVEL val = %d", ctrl->val);drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +1
-1- p->h264_level = ctrl->val; + p->level = ctrl->val;break;
caseV4L2_CID_MPEG_VIDEO_H264_I_PERIOD:
mtk_v4l2_venc_dbg(2, ctx, "V4L2_CID_MPEG_VIDEO_H264_I_PERIOD val = %d", ctrl->val);drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +2
-2@@ -385,8 +385,8 @@ static void mtk_venc_set_param(struct mtk_vcodec_enc_ctx *ctx, mtk_v4l2_venc_err(ctx, "Unsupported fourcc =%d", q_data_src->fmt->fourcc); break; } - param->h264_profile = enc_params->h264_profile; - param->h264_level = enc_params->h264_level; + param->profile = enc_params->profile; + param->level = enc_params->level;
/* Config visible resolution */
param->width=q_data_src->visible_width;drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0@@ -402,8 +402,8 @@ static void mtk_venc_set_param(struct mtk_vcodec_enc_ctx *ctx,
mtk_v4l2_venc_dbg(0, ctx,
"fmt 0x%x, P/L %d/%d w/h %d/%d buf %d/%d fps/bps %d/%d gop %di_per%d",drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +2
-2- param->input_yuv_fmt, param->h264_profile, - param->h264_level, param->width, param->height, + param->input_yuv_fmt, param->profile, + param->level, param->width, param->height,
param->buf_width,param->buf_height,param->frm_rate,param->bitrate,param->gop_size,param->intra_period);drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0@@ -1157,6 +1157,8 @@ static void mtk_venc_worker(struct work_struct *work)frm_buf.fb_addr[i].size = (size_t)src_buf->vb2_buf.planes[i].length; }
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +2
-0+ frm_buf.num_planes = src_buf->vb2_buf.num_planes; +bs_buf.va =
vb2_plane_vaddr(&dst_buf->vb2_buf, 0); bs_buf.dma_addr =vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0); bs_buf.size = (size_t)dst_buf->vb2_buf.planes[0].length;drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h +4
-4@@ -69,8 +69,8 @@ enum mtk_encode_param {* @framerate_denom: frame rate denominator. ex: framerate_num=30 and * framerate_denom=1 means FPS is 30 * @h264_max_qp: Max value for H.264 quantization parameter -* @h264_profile: V4L2 defined H.264 profile -* @h264_level: V4L2 defined H.264 level +* @profile: V4L2 defined profile +* @level: V4L2 defined level * @force_intra: force/insert intra frame */ struct mtk_enc_params {@@ -84,8 +84,8 @@ struct mtk_enc_params { unsigned int framerate_num; unsigned int framerate_denom; unsigned int h264_max_qp; -unsigned int h264_profile; -unsigned int h264_level; +unsigned int profile; +unsigned int level; unsigned int force_intra; };drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c new file +674
-0@@ -0,0 +1,674 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2025 MediaTek Inc. +*/ + +#include "../mtk_vcodec_enc.h" +#include "../mtk_vcodec_enc_drv.h" +#include "../venc_drv_base.h" +#include "../venc_drv_if.h" +#include "../venc_vpu_if.h" +#include "../../common/mtk_vcodec_intr.h" +#include "../../common/mtk_vcodec_util.h" + +#define SEQ_HEADER_SIZE 1024 +#define PPS_SIZE 128 +#define MAX_DPB_SIZE 16 +#define MAX_VENC_CORE 3 +#define VENC_CONFIG_LENGTH 115 +#define VENC_CONFIG_DATA 128 +#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098 + +/** +* enum venc_bs_mode - encode bitstream mode +* @VENC_BS_MODE_SPS: encode sps +* @VENC_BS_MODE_PPS: encode pps +* @VENC_BS_MODE_VPS: encode vps +* @VENC_BS_MODE_SEQ_HDR: encode sequence header +* @VENC_BS_MODE_FRAME: encode frame +* @VENC_BS_MODE_FRAME_FINAL: encode final frame +* @VENC_BS_MODE_MAX: max value +*/ +enum venc_bs_mode { +VENC_BS_MODE_SPS =0 , +VENC_BS_MODE_PPS , +VENC_BS_MODE_VPS , +VENC_BS_MODE_SEQ_HDR , +VENC_BS_MODE_FRAME , +VENC_BS_MODE_FRAME_FINAL , +VENC_BS_MODE_MAX +}; + +/** +* struct venc_config - Structure for encoder configuration +* AP-W/R : AP is writer/reader on this item +* MCU-W/R: MCU is write/reader on this item +* @input_fourcc: input format fourcc +* @bitrate: target bitrate (in bps) +* @pic_w: visible width of resolution +* @pic_h: visible height of resolution +* @buf_w: buffer alignment width of resolution +* @buf_h: buffer alignment height of resolution +* @gop_size: group of picture size (IDR frame period) +* @intra_period: I frame period +* @framerate: frame rate in fps +* @profile: profile_idc in SPS +* @level: level_idc in SPS +* @core_num: encoder core num +* @dpb_size: encode dpb size +* @reserved: reserved fields config +*/ +struct venc_config { +__u32 input_fourcc; +__u32 bitrate; +__u32 pic_w; +__u32 pic_h; +__u32 buf_w; +__u32 buf_h; +__u32 gop_size; +__u32 intra_period; +__u32 framerate; +__u32 profile; +__u32 level; +__u32 core_num; +__u32 dpb_size; +__u32 reserved[VENC_CONFIG_LENGTH ]; +}; + +/** +* struct venc_config_data - Structure for configuration data +* @config_data: extended configuration data besides the basic configuration +*/ +struct venc_config_data { +unsigned int config_data[VENC_CONFIG_DATA ]; +}; + +/** +* struct venc_work_buf - Structure for working buffer information +* AP-W/R : AP is writer/reader on this item +* MCU-W/R: MCU is write/reader on this item +* @iova: IO virtual address +* @pa: physical address +* @pa_64: for 64bit pa padding +* @va: virtual address +* @va_padding: for 64bit va padding +* @size: buffer size +* @size_padding: for 64bit size padding +*/ +struct venc_work_buf { +unsigned long long iova; +union { +unsigned int pa; +unsigned long long pa_64; + }; +union { +void *va; +unsigned long long va_padding; + }; +union { +unsigned int size; +unsigned long long size_padding; + }; +}; + +/** +* struct venc_work_buf_list - Structure for encode working buffer list +* @rc_code: RC code buffer +* @rc_info: RC info buffer +* @luma: luma buffer +* @chroma: chroma buffer +* @sub_luma: sub luma buffer +* @sub_write: sub write buffer +* @col_mv: col_mv buffer +* @wpp: wpp buffer +* @wpp_nbm: wpp nbm buffer +* @skip_frame: skip frame buffer +*/ +struct venc_work_buf_list { +struct venc_work_buf rc_code; +struct venc_work_buf rc_info[MAX_VENC_CORE ]; +struct venc_work_buf luma[MAX_DPB_SIZE ]; +struct venc_work_buf chroma[MAX_DPB_SIZE ]; +struct venc_work_buf sub_luma[MAX_DPB_SIZE ]; +struct venc_work_buf sub_write[MAX_DPB_SIZE ]; +struct venc_work_buf col_mv[MAX_DPB_SIZE ]; +struct venc_work_buf wpp[MAX_VENC_CORE ]; +struct venc_work_buf wpp_nbm[MAX_VENC_CORE ]; +struct venc_work_buf skip_frame; +}; + +/** +* struct venc_info - Structure for encode frame and bs information +* @fb_addr: frame buffer address array +* @fb_size: frame buffer size array +* @bs_addr: bitstream buffer address +* @bs_size: bitstream buffer size +*/ +struct venc_info { +unsigned long long fb_addr[VIDEO_MAX_PLANES ]; +unsigned int fb_size[VIDEO_MAX_PLANES ]; +unsigned long long bs_addr; +unsigned long long bs_size; +}; + +/** +* struct venc_vsi - Structure for VCP driver control and info share +* AP-W/R : AP is writer/reader on this item +* VCP-W/R: VCP is write/reader on this item +* @config: encoder configuration +* @data: encoder configuration data +* @bufs: encoder working buffers +* @venc: encoder information +*/ +struct venc_vsi { +struct venc_config config; +struct venc_config_data data; +struct venc_work_buf_list bufs; +struct venc_info venc; +}; + +/** +* struct venc_inst - Structure for encoder instance +* @hw_base: hardware io address +* @pps_buf: PPS buffer +* @seq_buf: sequence header buffer +* @work_buf_allocated: work buffer allocated or not +* @frm_cnt: encoded frame count +* @skip_frm_cnt: encoded skip frame count +* @prepend_hdr: prepend header flag +* @vpu_inst: vpu instance +* @vsi: encode vsi +* @ctx: encoder context +*/ +struct venc_inst { +void __iomem *hw_base; +struct mtk_vcodec_mem pps_buf; +struct mtk_vcodec_mem seq_buf; +bool work_buf_allocated; +unsigned int frm_cnt; +unsigned int skip_frm_cnt; +unsigned int prepend_hdr; +struct venc_vpu_inst vpu_inst; +struct venc_vsi *vsi; +struct mtk_vcodec_enc_ctx *ctx; +}; + +static int venc_init (struct mtk_vcodec_enc_ctx *ctx) +{ +int ret =0 ; +struct venc_inst *inst; + + inst =kzalloc_obj (inst,GFP_KERNEL ); +if (!inst) +return -ENOMEM ; + + inst->ctx = ctx; + inst->vpu_inst.ctx = ctx; + inst->vpu_inst.id =mtk_vcodec_fw_get_venc_ipi (ctx->dev->fw_handler->type); + inst->hw_base =mtk_vcodec_get_reg_addr (inst->ctx->dev->reg_base,VENC_SYS ); + + ret =vpu_enc_init (&inst->vpu_inst); + inst->vsi = (struct venc_vsi *)inst->vpu_inst.vsi; + +if (ret) { +kfree (inst); +return ret; + } + + ctx->drv_handle = inst; + +return 0 ; +} + +static inline u32 venc_read_reg (struct venc_inst *inst,u32 addr) +{ +return readl (inst->hw_base + addr); +} + +static unsigned int venc_wait_encode_done (struct venc_inst *inst) +{ +unsigned int irq_status =0 ; +struct mtk_vcodec_enc_ctx *ctx = (struct mtk_vcodec_enc_ctx *)inst->ctx; + +if (!mtk_vcodec_wait_for_done_ctx (ctx,MTK_INST_IRQ_RECEIVED , + WAIT_INTR_TIMEOUT_MS, 0)) { + irq_status = ctx->irq_status; +mtk_venc_debug (ctx,"irq_status %x <-" , irq_status); + } +return irq_status; +} + +static void venc_set_bufs (struct venc_inst *inst, + struct venc_frm_buf *frm_buf, + struct mtk_vcodec_mem *bs_buf) +{ +unsigned int i; + +if (frm_buf) { +for (i =0 ; i < frm_buf->num_planes; i++) { + inst->vsi->venc.fb_addr[i] = frm_buf->fb_addr[i].dma_addr; + inst->vsi->venc.fb_size[i] = frm_buf->fb_addr[i].size; +mtk_venc_debug (inst->ctx,"%s: fb_buf[%d]: %llx(%d)\n" , + __func__, i, + inst->vsi->venc.fb_addr[i], + inst->vsi->venc.fb_size[i]); + } + } + +if (bs_buf) { + inst->vsi->venc.bs_addr = bs_buf->dma_addr; + inst->vsi->venc.bs_size = bs_buf->size; +mtk_venc_debug (inst->ctx,"%s: bs_buf: %llx(%d)\n" , + __func__, + inst->vsi->venc.bs_addr, + (unsigned int)inst->vsi->venc.bs_size); + } +} + +static int venc_encode_sps (struct venc_inst *inst, + struct mtk_vcodec_mem *bs_buf, + unsigned int *bs_size) +{ +int ret =0 ; +unsigned int irq_status; + +venc_set_bufs (inst,NULL , bs_buf); + ret =vpu_enc_encode (&inst->vpu_inst,VENC_BS_MODE_SPS ,NULL , bs_buf,NULL ); +if (ret) +return ret; + + irq_status =venc_wait_encode_done (inst); +if (irq_status !=MTK_VENC_IRQ_STATUS_SPS ) { +mtk_venc_err (inst->ctx,"expect irq status %d" ,MTK_VENC_IRQ_STATUS_SPS ); +return -EINVAL ; + } + + *bs_size =venc_read_reg (inst,VENC_PIC_BITSTREAM_BYTE_CNT ); +mtk_venc_debug (inst->ctx,"sps bs size %d <-" , *bs_size); + +return ret; +} + +static int venc_encode_pps (struct venc_inst *inst, + struct mtk_vcodec_mem *bs_buf, + unsigned int *bs_size) +{ +int ret =0 ; +unsigned int irq_status; + +venc_set_bufs (inst,NULL , bs_buf); + ret =vpu_enc_encode (&inst->vpu_inst,VENC_BS_MODE_PPS ,NULL , bs_buf,NULL ); +if (ret) +return ret; + + irq_status =venc_wait_encode_done (inst); +if (irq_status !=MTK_VENC_IRQ_STATUS_PPS ) { +mtk_venc_err (inst->ctx,"expect irq status %d" ,MTK_VENC_IRQ_STATUS_PPS ); +return -EINVAL ; + } + + *bs_size =venc_read_reg (inst,VENC_PIC_BITSTREAM_BYTE_CNT ); +mtk_venc_debug (inst->ctx,"pps bs size %d <-" , *bs_size); + +return ret; +} + +static int venc_encode_header (struct venc_inst *inst, + struct mtk_vcodec_mem *bs_buf, + unsigned int *bs_size) +{ +int ret =0 ; +unsigned int bs_size_sps; +unsigned int bs_size_pps; + + ret =venc_encode_sps (inst, bs_buf, &bs_size_sps); +if (ret) +return ret; + + ret =venc_encode_pps (inst, &inst->pps_buf, &bs_size_pps); +if (ret) +return ret; + +memcpy (bs_buf->va + bs_size_sps, inst->pps_buf.va, bs_size_pps); + *bs_size = bs_size_sps + bs_size_pps; + +return ret; +} + +static int venc_encode_frame (struct venc_inst *inst, + struct venc_frm_buf *frm_buf, + struct mtk_vcodec_mem *bs_buf, + unsigned int *bs_size) +{ +int ret =0 ; +unsigned int irq_status; + +venc_set_bufs (inst, frm_buf, bs_buf); + ret =vpu_enc_encode (&inst->vpu_inst,VENC_BS_MODE_FRAME , frm_buf, bs_buf,NULL ); +if (ret) +return ret; + + irq_status =venc_wait_encode_done (inst); +if (irq_status !=MTK_VENC_IRQ_STATUS_FRM ) { +mtk_venc_err (inst->ctx,"expect irq status %d" ,MTK_VENC_IRQ_STATUS_FRM ); +return -EINVAL ; + } + + *bs_size =venc_read_reg (inst,VENC_PIC_BITSTREAM_BYTE_CNT ); + + ++inst->frm_cnt; + +return ret; +} + +static int venc_encode (void *handle, + enum venc_start_opt opt, + struct venc_frm_buf *frm_buf, + struct mtk_vcodec_mem *bs_buf, + struct venc_done_result *result) +{ +int ret =0 ; +struct venc_inst *inst = (struct venc_inst *)handle; +struct mtk_vcodec_enc_ctx *ctx; +unsigned int bs_size_hdr; + +if (WARN_ON (!inst || !inst->vsi)) +return -EINVAL ; + + ctx = inst->ctx; + +mtk_venc_debug (ctx,"%s: opt: %d\n" , __func__, opt); + +enable_irq (ctx->dev->enc_irq); +switch (opt) { +case VENC_START_OPT_ENCODE_SEQUENCE_HEADER : { + ret =venc_encode_header (inst, bs_buf, &bs_size_hdr); +if (ret) + goto encode_err; + + result->bs_size = bs_size_hdr; + result->is_key_frm = false; +break ; + } + +case VENC_START_OPT_ENCODE_FRAME : { +if (!inst->prepend_hdr) { + ret =venc_encode_frame (inst, frm_buf, bs_buf, &result->bs_size); +if (ret) + goto encode_err; + + result->is_key_frm = inst->vpu_inst.is_key_frm; +break ; + } + + ret =venc_encode_header (inst, &inst->seq_buf, &bs_size_hdr); +if (ret) + goto encode_err; + + ret =venc_encode_frame (inst, frm_buf, bs_buf, &result->bs_size); +if (ret) + goto encode_err; + +memmove (bs_buf->va + bs_size_hdr, bs_buf->va, result->bs_size); +memcpy (bs_buf->va, inst->seq_buf.va, bs_size_hdr); + result->bs_size += bs_size_hdr; + + inst->prepend_hdr =0 ; + result->is_key_frm = inst->vpu_inst.is_key_frm; +break ; + } + +default : +mtk_venc_err (inst->ctx,"venc_opt %d not supported" , opt); + ret = -EINVAL ; +break ; + } + +encode_err: +disable_irq (ctx->dev->enc_irq); +mtk_venc_debug (ctx,"opt %d, return %d" , opt, ret); + +return ret; +} + +static int mtk_venc_mem_alloc (struct venc_inst *inst, + struct device *dev, + struct venc_work_buf *buf) +{ +dma_addr_t dma_addr; + +if (WARN_ON (!dev || !buf)) +return -EINVAL ; + +if (buf->size ==0 ) +return 0 ; + + buf->va =dma_alloc_coherent (dev, buf->size, &dma_addr,GFP_KERNEL ); +if (!buf->va) +return -ENOMEM ; + + buf->iova = (unsigned long long )dma_addr; + +mtk_venc_debug (inst->ctx,"allocate buffer, size: %d, va: %p, iova: 0x%llx" , + buf->size, buf->va, buf->iova); + +return 0 ; +} + +static void mtk_venc_mem_free (struct venc_inst *inst, + struct device *dev, + struct venc_work_buf *buf) +{ +if (WARN_ON (!dev || !buf)) +return ; + +if (!buf->va) +return ; + +mtk_venc_debug (inst->ctx,"free buffer, size: %d, va: %p, iova: 0x%llx" , + buf->size, buf->va, buf->iova); + +dma_free_coherent (dev, buf->size, buf->va, buf->iova); + buf->va =NULL ; + buf->iova =0 ; + buf->size =0 ; +} + +static void venc_free_rc_buf (struct venc_inst *inst, + struct venc_work_buf_list *bufs, + unsigned int core_num) +{ +int i; +struct device *dev; + + dev = &inst->ctx->dev->plat_dev->dev; +mtk_venc_mem_free (inst, dev, &bufs->rc_code); + +for (i =0 ; i < core_num; i++) +mtk_venc_mem_free (inst, dev, &bufs->rc_info[i]); +} + +static void venc_free_work_buf (struct venc_inst *inst) +{ +int i; +struct venc_work_buf_list *bufs = &inst->vsi->bufs; +unsigned int core_num = inst->vsi->config.core_num; +unsigned int dpb_size = inst->vsi->config.dpb_size; +struct device *dev; + +if (bufs->rc_code.va) +venc_free_rc_buf (inst, bufs, core_num); + + dev = &inst->ctx->dev->plat_dev->dev; + +for (i =0 ; i < core_num; i++) { +mtk_venc_mem_free (inst, dev, &bufs->wpp[i]); +mtk_venc_mem_free (inst, dev, &bufs->wpp_nbm[i]); + } + +for (i =0 ; i < dpb_size; i++) { +mtk_venc_mem_free (inst, dev, &bufs->luma[i]); +mtk_venc_mem_free (inst, dev, &bufs->chroma[i]); +mtk_venc_mem_free (inst, dev, &bufs->sub_luma[i]); +mtk_venc_mem_free (inst, dev, &bufs->sub_write[i]); +mtk_venc_mem_free (inst, dev, &bufs->col_mv[i]); + } + +if (inst->pps_buf.va) +mtk_vcodec_mem_free (inst->ctx, &inst->pps_buf); + +if (inst->seq_buf.va) +mtk_vcodec_mem_free (inst->ctx, &inst->seq_buf); +} + +static int venc_alloc_rc_buf (struct venc_inst *inst, + struct venc_work_buf_list *bufs, + unsigned int core_num) +{ +int i; +struct mtk_vcodec_fw *fw = inst->ctx->dev->fw_handler; +struct device *dev; +void *tmp_va; + + dev = &inst->ctx->dev->plat_dev->dev; +if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) +return -ENOMEM ; + + tmp_va =mtk_vcodec_fw_map_dm_addr (fw, bufs->rc_code.pa); +memcpy (bufs->rc_code.va, tmp_va, bufs->rc_code.size); + +for (i =0 ; i < core_num; i++) { +if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_info[i])) + goto err_rc_buf; + } + +return 0 ; + +err_rc_buf: +venc_free_rc_buf (inst, bufs, core_num); + +return -ENOMEM ; +} + +static int venc_alloc_work_buf (struct venc_inst *inst) +{ +int i, ret; +struct venc_work_buf_list *bufs = &inst->vsi->bufs; +unsigned int core_num = inst->vsi->config.core_num; +unsigned int dpb_size = inst->vsi->config.dpb_size; +struct device *dev; + +if (bufs->rc_code.size !=0 ) { + ret =venc_alloc_rc_buf (inst, bufs, core_num); +if (ret) { +mtk_venc_err (inst->ctx,"cannot allocate rc buf" ); +return -ENOMEM ; + } + } + + dev = &inst->ctx->dev->plat_dev->dev; + +for (i =0 ; i < core_num; i++) { +if (mtk_venc_mem_alloc (inst, dev, &bufs->wpp[i]) || + mtk_venc_mem_alloc(inst, dev, &bufs->wpp_nbm[i])) + goto err_alloc; + } + +for (i =0 ; i < dpb_size; i++) { +if (mtk_venc_mem_alloc (inst, dev, &bufs->luma[i]) || + mtk_venc_mem_alloc(inst, dev, &bufs->chroma[i]) || + mtk_venc_mem_alloc(inst, dev, &bufs->sub_luma[i]) || + mtk_venc_mem_alloc(inst, dev, &bufs->sub_write[i]) || + mtk_venc_mem_alloc(inst, dev, &bufs->col_mv[i])) + goto err_alloc; + } + +/* the pps_buf and seq_buf are used by AP side only */ + inst->pps_buf.size =PPS_SIZE ; + ret =mtk_vcodec_mem_alloc (inst->ctx, &inst->pps_buf); +if (ret) { +mtk_venc_err (inst->ctx,"cannot allocate pps_buf" ); + goto err_alloc; + } + + inst->seq_buf.size =SEQ_HEADER_SIZE ; + ret =mtk_vcodec_mem_alloc (inst->ctx, &inst->seq_buf); +if (ret) { +mtk_venc_err (inst->ctx,"cannot allocate seq_buf" ); + goto err_alloc; + } +return 0 ; + +err_alloc: +venc_free_work_buf (inst); +return -ENOMEM ; +} + +static int venc_set_param (void *handle, + enum venc_set_param_type type, + struct venc_enc_param *enc_prm) +{ +int ret =0 ; +struct venc_inst *inst = (struct venc_inst *)handle; + +switch (type) { +case VENC_SET_PARAM_ENC : +if (WARN_ON (!inst->vsi)) +return -EINVAL ; + inst->vsi->config.input_fourcc = enc_prm->input_yuv_fmt; + inst->vsi->config.bitrate = enc_prm->bitrate; + inst->vsi->config.pic_w = enc_prm->width; + inst->vsi->config.pic_h = enc_prm->height; + inst->vsi->config.buf_w = enc_prm->buf_width; + inst->vsi->config.buf_h = enc_prm->buf_height; + inst->vsi->config.gop_size = enc_prm->gop_size; + inst->vsi->config.framerate = enc_prm->frm_rate; + inst->vsi->config.intra_period = enc_prm->intra_period; + inst->vsi->config.profile = enc_prm->profile; + inst->vsi->config.level = enc_prm->level; + + ret =vpu_enc_set_param (&inst->vpu_inst, type, enc_prm); +if (ret) +break ; + +if (inst->work_buf_allocated) { +venc_free_work_buf (inst); + inst->work_buf_allocated = false; + } + ret =venc_alloc_work_buf (inst); +if (ret) +break ; + inst->work_buf_allocated = true; +break ; +case VENC_SET_PARAM_PREPEND_HEADER : + inst->prepend_hdr =1 ; +break ; +default : + ret =vpu_enc_set_param (&inst->vpu_inst, type, enc_prm); +break ; + } + +return ret; +} + +static int venc_deinit (void *handle) +{ +int ret =0 ; +struct venc_inst *inst = (struct venc_inst *)handle; + + ret =vpu_enc_deinit (&inst->vpu_inst); + +if (inst->work_buf_allocated) +venc_free_work_buf (inst); + +kfree (inst); + +return ret; +} + +const struct venc_common_if venc_if = { + .init = venc_init, + .encode = venc_encode, + .set_param = venc_set_param, + .deinit = venc_deinit, +};drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c +0
-0@@ -723,9 +723,9 @@ static void h264_enc_set_vsi_configs(struct venc_h264_inst *inst, inst->vsi->config.framerate = enc_prm->frm_rate; inst->vsi->config.intra_period = enc_prm->intra_period;
inst->vsi->config.profile=drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c +1
-1-h264_get_profile (inst, enc_prm->h264_profile); +h264_get_profile (inst, enc_prm->profile);
inst->vsi->config.level=drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c +1
-1-h264_get_level (inst, enc_prm->h264_level); +h264_get_level (inst, enc_prm->level);
inst->vsi->config.wfd= 0;
}drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c +0
-0@@ -742,9 +742,9 @@ static void h264_enc_set_vsi_34_configs(struct venc_h264_inst *inst, inst->vsi_34->config.framerate = enc_prm->frm_rate; inst->vsi_34->config.intra_period = enc_prm->intra_period;
inst->vsi_34->config.profile=drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c +1
-1-h264_get_profile (inst, enc_prm->h264_profile); +h264_get_profile (inst, enc_prm->profile);
inst->vsi_34->config.level=drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c +1
-1-h264_get_level (inst, enc_prm->h264_level); +h264_get_level (inst, enc_prm->level);
inst->vsi_34->config.wfd= 0;
}drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.h +6
-4@@ -66,8 +66,8 @@ enum venc_set_param_type { * struct venc_enc_prm - encoder settings for VENC_SET_PARAM_ENC used in * venc_if_set_param() * @input_fourcc: input yuv format - * @h264_profile: V4L2 defined H.264 profile - * @h264_level: V4L2 defined H.264 level + * @profile: V4L2 defined profile + * @level: V4L2 defined level * @width: image width * @height: image height * @buf_width: buffer width@@ -79,8 +79,8 @@ enum venc_set_param_type {*/ struct venc_enc_param { enum venc_yuv_fmt input_yuv_fmt; -unsigned int h264_profile; -unsigned int h264_level; +unsigned int profile; +unsigned int level; unsigned int width; unsigned int height; unsigned int buf_width;@@ -107,9 +107,11 @@ struct venc_frame_info { /* * struct venc_frm_buf - frame buffer information used in venc_if_encode() * @fb_addr: plane frame buffer addresses + * @num_planes: number of planes */ struct venc_frm_buf { struct mtk_vcodec_fb fb_addr[MTK_VCODEC_MAX_PLANES]; +unsigned int num_planes; };
/*drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.h +0
-0@@ -124,6 +126,7 @@ struct venc_done_result {
extern const structvenc_common_ifvenc_h264_if;
extern const structvenc_common_ifvenc_vp8_if;
+extern const structvenc_common_ifvenc_if;
/*
*venc_if_init- Create the driver handle
PATCH v6 3/6 media: mediatek: encoder: Add support for common firmware interface
In reply to Irui WangThe existing encoder firmware interface implied just one type of codec:
H.264. Future encoders may support additional codecs; however adding entire sets of interfaces for them is not scalable.
Instead, a new "common" firmware interface is defined for non codec specific messages. The new messages encapsulate the old ones for backward compatibility.
This patch adds support for these new messages.
--- .../vcodec/encoder/mtk_vcodec_enc_drv.h | 3 ++ .../mediatek/vcodec/encoder/venc_drv_if.c | 3 +- .../mediatek/vcodec/encoder/venc_ipi_msg.h | 26 +++++++++++++++ .../mediatek/vcodec/encoder/venc_vpu_if.c | 33 ++++++++++++------- 4 files changed, 52 insertions(+), 13 deletions(-)
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h +3 -0
@@ -16,6 +16,7 @@#define MTK_ENC_CTX_IS_EXT (ctx) ((ctx)->dev->venc_pdata->uses_ext)#define MTK_ENC_IOVA_IS_34BIT (ctx) ((ctx)->dev->venc_pdata->uses_34bit) +#define MTK_ENC_DRV_IS_COMM (ctx) (((ctx)->dev->venc_pdata->uses_common_fw_iface))/** * struct mtk_vcodec_enc_pdata - compatible data for each IC
@@ -29,6 +30,7 @@* @num_output_formats: number of entries in output_formats * @core_id: stand for h264 or vp8 encode index * @uses_34bit: whether the encoder uses 34-bit iova +* @uses_common_fw_iface: whether the encoder uses common driver interface */ struct mtk_vcodec_enc_pdata {bool uses_ext;
@@ -40,6 +42,7 @@ struct mtk_vcodec_enc_pdata {size_t num_output_formats;u8 core_id;bool uses_34bit; +bool uses_common_fw_iface; };/*
drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.c +2 -1
@@ -19,13 +19,14 @@int venc_if_init (struct mtk_vcodec_enc_ctx *ctx,unsigned int fourcc) {int ret =0 ; +const bool uses_common_fw_iface =MTK_ENC_DRV_IS_COMM (ctx);switch (fourcc) {case V4L2_PIX_FMT_VP8 : ctx->enc_if = &venc_vp8_if;break ;case V4L2_PIX_FMT_H264 : - ctx->enc_if = &venc_h264_if; + ctx->enc_if = uses_common_fw_iface ? &venc_if : &venc_h264_if;break ;default :return -EINVAL ;
drivers/media/platform/mediatek/vcodec/encoder/venc_ipi_msg.h +26 -0
@@ -45,6 +45,20 @@ struct venc_ap_ipi_msg_init {uint64_t venc_inst; }; +/** +* struct venc_ap_ipi_msg_init_comm - AP to VPU init cmd structure +* @base: AP to VPU init cmd structure +* @codec_type: encoder type +* @reserved: reserved field +* @shared_iova: shared iova +*/ +struct venc_ap_ipi_msg_init_comm { +struct venc_ap_ipi_msg_init base; +u32 codec_type; +u32 reserved; +u64 shared_iova; +}; +/** * struct venc_ap_ipi_msg_set_param - AP to VPU set_param cmd structure * @msg_id: message id (AP_IPIMSG_XXX_ENC_SET_PARAM)
@@ -175,6 +189,18 @@ struct venc_vpu_ipi_msg_init {uint32_t venc_abi_version; }; +/** +* struct venc_vpu_ipi_msg_init_comm - VPU ack AP init cmd structure +* @init_ack: AP init cmd structure +* @vpu_vsi_addr: VSI address from VPU +* @reserved: reserved field +*/ +struct venc_vpu_ipi_msg_init_comm { +struct venc_vpu_ipi_msg_init init_ack; +u32 vpu_vsi_addr; +u32 reserved; +}; +/** * struct venc_vpu_ipi_msg_set_param - VPU ack AP set_param cmd structure * @msg_id: message id (VPU_IPIMSG_XXX_ENC_SET_PARAM_DONE)
drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +21 -12
@@ -10,24 +10,25 @@static void handle_enc_init_msg (struct venc_vpu_inst *vpu,const void *data) { -const struct venc_vpu_ipi_msg_init *msg = data; +const struct venc_vpu_ipi_msg_init_comm *msg = data; +struct mtk_vcodec_fw *fw = vpu->ctx->dev->fw_handler; - vpu->inst_addr = msg->vpu_inst_addr; - vpu->vsi =mtk_vcodec_fw_map_dm_addr (vpu->ctx->dev->fw_handler, - msg->vpu_inst_addr); + vpu->inst_addr = msg->init_ack.vpu_inst_addr; + vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw, vpu->inst_addr);/* Firmware version field value is unspecified on MT8173. */ -if (mtk_vcodec_fw_get_type (vpu->ctx->dev->fw_handler) ==VPU ) +if (mtk_vcodec_fw_get_type (fw) ==VPU )return ;/* Check firmware version. */ -mtk_venc_debug (vpu->ctx,"firmware version: 0x%x\n" , msg->venc_abi_version); -switch (msg->venc_abi_version) { +mtk_venc_debug (vpu->ctx,"firmware version: 0x%x\n" , + msg->init_ack.venc_abi_version); +switch (msg->init_ack.venc_abi_version) {case 1 :break ;default :mtk_venc_err (vpu->ctx,"unhandled firmware version 0x%x\n" , - msg->venc_abi_version); + msg->init_ack.venc_abi_version); vpu->failure =1 ;break ; }
@@ -133,7 +134,8 @@ static int vpu_enc_send_msg(struct venc_vpu_inst *vpu, void *msg,int vpu_enc_init (struct venc_vpu_inst *vpu) {int status; -struct venc_ap_ipi_msg_init out = { }; +size_t msg_size; +struct venc_ap_ipi_msg_init_comm out = { };init_waitqueue_head (&vpu->wq_hd); vpu->signaled =0 ;
@@ -149,9 +151,16 @@ int vpu_enc_init(struct venc_vpu_inst *vpu)return -EINVAL ; } - out.msg_id =AP_IPIMSG_ENC_INIT ; - out.venc_inst = (unsigned long )vpu; -if (vpu_enc_send_msg (vpu, &out,sizeof (out))) { + out.base.msg_id =AP_IPIMSG_ENC_INIT ; + out.base.venc_inst = (unsigned long )vpu; +if (MTK_ENC_DRV_IS_COMM (vpu->ctx)) { + out.codec_type = vpu->ctx->q_data[MTK_Q_DATA_DST ].fmt->fourcc; + msg_size =sizeof (struct venc_ap_ipi_msg_init_comm ); + }else { + msg_size =sizeof (struct venc_ap_ipi_msg_init ); + } + +if (vpu_enc_send_msg (vpu, &out, msg_size)) {mtk_venc_err (vpu->ctx,"AP_IPIMSG_ENC_INIT fail" );return -EINVAL ; }
Signature · 1 line
2.45.2
PATCH v6 4/6 media: mediatek: encoder: Add support for VCP encode process
In reply to Irui WangAdapt the encoder driver to support VCP firmware interface.
Set the encoder driver firmware type to 'VCP'.
Allocate RC buffers using the VCP device.
Send the shared memory address to VCP and map the encoder VSI address to the CPU address space using the VCP shared memory address.
--- .../mediatek/vcodec/common/mtk_vcodec_fw.c | 6 +++++ .../mediatek/vcodec/common/mtk_vcodec_fw.h | 1 + .../vcodec/common/mtk_vcodec_fw_priv.h | 1 + .../vcodec/common/mtk_vcodec_fw_vcp.c | 6 +++++ .../vcodec/encoder/mtk_vcodec_enc_drv.c | 3 +++ .../vcodec/encoder/venc/venc_common_if.c | 23 ++++++++++++++----- .../mediatek/vcodec/encoder/venc_vpu_if.c | 14 ++++++++++- 7 files changed, 47 insertions(+), 7 deletions(-)
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c +6 -0
@@ -105,3 +105,9 @@ int mtk_vcodec_fw_get_type(struct mtk_vcodec_fw *fw)return fw->type; }EXPORT_SYMBOL_GPL (mtk_vcodec_fw_get_type); + +struct device *mtk_vcodec_fw_get_dev (struct mtk_vcodec_fw *fw) +{ +return fw->ops->get_fw_dev (fw); +} +EXPORT_SYMBOL_GPL (mtk_vcodec_fw_get_dev);
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +1 -0
@@ -43,5 +43,6 @@ int mtk_vcodec_fw_ipi_send(struct mtk_vcodec_fw *fw, int id,int mtk_vcodec_fw_get_type (struct mtk_vcodec_fw *fw);int mtk_vcodec_fw_get_ipi (enum mtk_vcodec_fw_type type,int hw_id);int mtk_vcodec_fw_get_venc_ipi (enum mtk_vcodec_fw_type type); +struct device *mtk_vcodec_fw_get_dev (struct mtk_vcodec_fw *fw);#endif /* _MTK_VCODEC_FW_H_ */
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_priv.h +1 -0
@@ -29,6 +29,7 @@ struct mtk_vcodec_fw_ops {int (*ipi_send)(struct mtk_vcodec_fw *fw,int id,void *buf,unsigned int len,unsigned int wait);void (*release)(struct mtk_vcodec_fw *fw); +struct device *(*get_fw_dev)(struct mtk_vcodec_fw *fw); };#if IS_ENABLED (CONFIG_VIDEO_MEDIATEK_VCODEC_VPU )
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vcp.c +6 -0
@@ -500,6 +500,11 @@ static void mtk_vcodec_vcp_release(struct mtk_vcodec_fw *fw) } +static struct device *mtk_vcodec_vcp_get_fw_dev (struct mtk_vcodec_fw *fw) +{ +return fw->vcp->vcp_device->dev; +} +static const struct mtk_vcodec_fw_ops mtk_vcodec_vcp_msg = { .load_firmware = mtk_vcodec_vcp_load_firmware, .get_vdec_capa = mtk_vcodec_vcp_get_vdec_capa,
@@ -508,6 +513,7 @@ static const struct mtk_vcodec_fw_ops mtk_vcodec_vcp_msg = { .ipi_register = mtk_vcodec_vcp_set_ipi_register, .ipi_send = mtk_vcodec_vcp_ipi_send, .release = mtk_vcodec_vcp_release, + .get_fw_dev = mtk_vcodec_vcp_get_fw_dev, };struct mtk_vcodec_fw *mtk_vcodec_fw_vcp_init (void *priv,enum mtk_vcodec_fw_use fw_use)
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c +3 -0
@@ -262,6 +262,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev) }else if (!of_property_read_u32 (pdev->dev.of_node,"mediatek,scp" , &rproc_phandle)) { fw_type =SCP ; + }else if (!of_property_read_u32 (pdev->dev.of_node,"mediatek,vcp" , + &rproc_phandle)) { + fw_type =VCP ; }else {dev_err (&pdev->dev,"[MTK VCODEC] Could not get venc IPI device" );return -ENODEV ;
drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c +17 -6
@@ -480,8 +480,13 @@ static void venc_free_rc_buf(struct venc_inst *inst, {int i;struct device *dev; +struct mtk_vcodec_fw *fw = inst->ctx->dev->fw_handler; + +if (mtk_vcodec_fw_get_type (fw) ==VCP ) + dev =mtk_vcodec_fw_get_dev (fw); +else + dev = &inst->ctx->dev->plat_dev->dev; - dev = &inst->ctx->dev->plat_dev->dev;mtk_venc_mem_free (inst, dev, &bufs->rc_code);for (i =0 ; i < core_num; i++)
@@ -530,12 +535,18 @@ static int venc_alloc_rc_buf(struct venc_inst *inst,struct device *dev;void *tmp_va; - dev = &inst->ctx->dev->plat_dev->dev; -if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) -return -ENOMEM ; +if (mtk_vcodec_fw_get_type (fw) ==VCP ) { + dev =mtk_vcodec_fw_get_dev (fw); +if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) +return -ENOMEM ; + }else { + dev = &inst->ctx->dev->plat_dev->dev; +if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) +return -ENOMEM ; - tmp_va =mtk_vcodec_fw_map_dm_addr (fw, bufs->rc_code.pa); -memcpy (bufs->rc_code.va, tmp_va, bufs->rc_code.size); + tmp_va =mtk_vcodec_fw_map_dm_addr (fw, bufs->rc_code.pa); +memcpy (bufs->rc_code.va, tmp_va, bufs->rc_code.size); + }for (i =0 ; i < core_num; i++) {if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_info[i]))
drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +13 -1
@@ -8,13 +8,23 @@#include "venc_ipi_msg.h" #include "venc_vpu_if.h" +#define VSI_OFFSET_MASK 0x0FFFFFFF +static void handle_enc_init_msg (struct venc_vpu_inst *vpu,const void *data) {const struct venc_vpu_ipi_msg_init_comm *msg = data;struct mtk_vcodec_fw *fw = vpu->ctx->dev->fw_handler; +u64 pa_start, vsi_offset; vpu->inst_addr = msg->init_ack.vpu_inst_addr; - vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw, vpu->inst_addr); + +if (mtk_vcodec_fw_get_type (fw) ==VCP ) { + pa_start = (u64 )fw->vcp->iova_addr; + vsi_offset = (msg->vpu_vsi_addr &VSI_OFFSET_MASK ) - (pa_start &VSI_OFFSET_MASK ); + vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw,ENCODER_MEM ) + vsi_offset; + }else { + vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw, msg->vpu_vsi_addr); + }/* Firmware version field value is unspecified on MT8173. */ if (mtk_vcodec_fw_get_type (fw) ==VPU )
@@ -155,6 +165,8 @@ int vpu_enc_init(struct venc_vpu_inst *vpu) out.base.venc_inst = (unsigned long )vpu;if (MTK_ENC_DRV_IS_COMM (vpu->ctx)) { out.codec_type = vpu->ctx->q_data[MTK_Q_DATA_DST ].fmt->fourcc; +if (mtk_vcodec_fw_get_type (vpu->ctx->dev->fw_handler) ==VCP ) + out.shared_iova = vpu->ctx->dev->fw_handler->vcp->iova_addr; msg_size =sizeof (struct venc_ap_ipi_msg_init_comm ); }else { msg_size =sizeof (struct venc_ap_ipi_msg_init );
Signature · 1 line
2.45.2
Re: [PATCH v6 4/6] media: mediatek: encoder: Add support for VCP encode process
Le jeudi 23 avril 2026 à 15:33 +0800, Irui Wang a écrit :
Quoted 84 lines
Adapt the encoder driver to support VCP firmware interface.
Set the encoder driver firmware type to 'VCP'.
Allocate RC buffers using the VCP device.
Send the shared memory address to VCP and map the encoder VSI address to the CPU address space using the VCP shared memory address.Signed-off-by Irui Wang <[email protected]>---
.../mediatek/vcodec/common/mtk_vcodec_fw.c | 6 +++++ .../mediatek/vcodec/common/mtk_vcodec_fw.h | 1 + .../vcodec/common/mtk_vcodec_fw_priv.h | 1 + .../vcodec/common/mtk_vcodec_fw_vcp.c | 6 +++++ .../vcodec/encoder/mtk_vcodec_enc_drv.c | 3 +++ .../vcodec/encoder/venc/venc_common_if.c | 23 ++++++++++++++----- .../mediatek/vcodec/encoder/venc_vpu_if.c | 14 ++++++++++-7 files changed, 47 insertions(+), 7 deletions(-)drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c +6
-0@@ -105,3 +105,9 @@ int mtk_vcodec_fw_get_type(struct mtk_vcodec_fw *fw) return fw->type; } EXPORT_SYMBOL_GPL(mtk_vcodec_fw_get_type); + +struct device *mtk_vcodec_fw_get_dev (struct mtk_vcodec_fw *fw) +{ +return fw->ops->get_fw_dev (fw); +} +EXPORT_SYMBOL_GPL (mtk_vcodec_fw_get_dev);drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +1
-0@@ -43,5 +43,6 @@ int mtk_vcodec_fw_ipi_send(struct mtk_vcodec_fw *fw, int id, int mtk_vcodec_fw_get_type(struct mtk_vcodec_fw *fw); int mtk_vcodec_fw_get_ipi(enum mtk_vcodec_fw_type type, int hw_id); int mtk_vcodec_fw_get_venc_ipi(enum mtk_vcodec_fw_type type); +struct device *mtk_vcodec_fw_get_dev (struct mtk_vcodec_fw *fw);
#endif /* _MTK_VCODEC_FW_H_ */drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_priv.h +1
-0@@ -29,6 +29,7 @@ struct mtk_vcodec_fw_ops { int (*ipi_send)(struct mtk_vcodec_fw *fw, int id, void *buf, unsigned int len, unsigned int wait); void (*release)(struct mtk_vcodec_fw *fw); +struct device *(*get_fw_dev)(struct mtk_vcodec_fw *fw); };
#ifIS_ENABLED(CONFIG_VIDEO_MEDIATEK_VCODEC_VPU)drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vcp.c +0
-0@@ -500,6 +500,11 @@ static void mtk_vcodec_vcp_release(struct mtk_vcodec_fw *fw)
}drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vcp.c +5
-0+static struct device *mtk_vcodec_vcp_get_fw_dev (struct mtk_vcodec_fw *fw) +{ +return fw->vcp->vcp_device->dev; +} +static const struct
mtk_vcodec_fw_opsmtk_vcodec_vcp_msg= { .load_firmware =mtk_vcodec_vcp_load_firmware, .get_vdec_capa =mtk_vcodec_vcp_get_vdec_capa,drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vcp.c +1
-0@@ -508,6 +513,7 @@ static const struct mtk_vcodec_fw_ops mtk_vcodec_vcp_msg = { .ipi_register = mtk_vcodec_vcp_set_ipi_register, .ipi_send = mtk_vcodec_vcp_ipi_send, .release = mtk_vcodec_vcp_release, + .get_fw_dev = mtk_vcodec_vcp_get_fw_dev, };
structmtk_vcodec_fw*mtk_vcodec_fw_vcp_init(void *priv, enummtk_vcodec_fw_usefw_use)drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c +0
-0
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c static int mtk_vcodec_probe(struct platform_device *pdev) · line 267
Quoted 6 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c +3
-0@@ -262,6 +262,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev) } else if (!of_property_read_u32(pdev->dev.of_node, "mediatek,scp", &rproc_phandle)) { fw_type = SCP; + }else if (!of_property_read_u32 (pdev->dev.of_node,"mediatek,vcp" , + &rproc_phandle)) { + fw_type =VCP ;
Similar comment on the patchset you depend on, its third firmware type, and time to cleanup. The of_device_get_match_data() should be sufficient for this simple case, there is not reason for custom DT parsing here. PLace the fw_type in the pdata, and move of_device_get_match_data() call earlier.
Please apply the same logic for the entire patchset. Every bit of information that is purely static to your device is better placed in the pdata then through addition of if/else conditions all over the place. The pdata can also have ops in it, letting easily firmware specific code without having to do if/else everywhere.
Nicolas
Quoted 84 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c +0
-0} else { dev_err(&pdev->dev, "[MTK VCODEC] Could not get venc IPI device"); return -ENODEV;drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c +6
-0@@ -480,8 +480,13 @@ static void venc_free_rc_buf(struct venc_inst *inst, { int i; struct device *dev; +struct mtk_vcodec_fw *fw = inst->ctx->dev->fw_handler; + +if (mtk_vcodec_fw_get_type (fw) ==VCP ) + dev =mtk_vcodec_fw_get_dev (fw); +else + dev = &inst->ctx->dev->plat_dev->dev;drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c +0
-1- dev = &inst->ctx->dev->plat_dev->dev;
mtk_venc_mem_free(inst, dev, &bufs->rc_code);
for (i = 0; i <core_num; i++)drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c +0
-0@@ -530,12 +535,18 @@ static int venc_alloc_rc_buf(struct venc_inst *inst, struct device *dev; void *tmp_va;drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c +8
-3- dev = &inst->ctx->dev->plat_dev->dev; -if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) -return -ENOMEM ; +if (mtk_vcodec_fw_get_type (fw) ==VCP ) { + dev =mtk_vcodec_fw_get_dev (fw); +if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) +return -ENOMEM ; + }else { + dev = &inst->ctx->dev->plat_dev->dev; +if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) +return -ENOMEM ;drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c +3
-2- tmp_va =mtk_vcodec_fw_map_dm_addr (fw, bufs->rc_code.pa); -memcpy (bufs->rc_code.va, tmp_va, bufs->rc_code.size); + tmp_va =mtk_vcodec_fw_map_dm_addr (fw, bufs->rc_code.pa); +memcpy (bufs->rc_code.va, tmp_va, bufs->rc_code.size); + }
for (i = 0; i <core_num; i++) {
if (mtk_venc_mem_alloc(inst, dev, &bufs->rc_info[i]))drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +0
-0@@ -8,13 +8,23 @@ #include "venc_ipi_msg.h" #include "venc_vpu_if.h"drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +2
-0+#define VSI_OFFSET_MASK 0x0FFFFFFF +static void
handle_enc_init_msg(struct venc_vpu_inst *vpu, const void *data){
const structvenc_vpu_ipi_msg_init_comm*msg = data; structmtk_vcodec_fw*fw =vpu->ctx->dev->fw_handler;drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +1
-0+u64 pa_start, vsi_offset;
vpu->inst_addr=msg->init_ack.vpu_inst_addr;drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +8
-1- vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw, vpu->inst_addr); + +if (mtk_vcodec_fw_get_type (fw) ==VCP ) { + pa_start = (u64 )fw->vcp->iova_addr; + vsi_offset = (msg->vpu_vsi_addr &VSI_OFFSET_MASK ) - (pa_start &VSI_OFFSET_MASK ); + vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw,ENCODER_MEM ) + vsi_offset; + }else { + vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw, msg->vpu_vsi_addr); + }
/* Firmware version field value is unspecified on MT8173. */ if (mtk_vcodec_fw_get_type(fw)== VPU)drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +2
-0@@ -155,6 +165,8 @@ int vpu_enc_init(struct venc_vpu_inst *vpu) out.base.venc_inst = (unsigned long)vpu; if (MTK_ENC_DRV_IS_COMM(vpu->ctx)) { out.codec_type = vpu->ctx->q_data[MTK_Q_DATA_DST].fmt->fourcc; +if (mtk_vcodec_fw_get_type (vpu->ctx->dev->fw_handler) ==VCP ) + out.shared_iova = vpu->ctx->dev->fw_handler->vcp->iova_addr; msg_size = sizeof(struct venc_ap_ipi_msg_init_comm); } else { msg_size = sizeof(struct venc_ap_ipi_msg_init);
Re: [PATCH v6 4/6] media: mediatek: encoder: Add support for VCP encode process
Dear Nicolas,
Thank you greatly for taking the time to help review the patch.
Quoted 146 lines · Nicolas Dufresne
Quoted 117 lines · Irui Wang
Adapt the encoder driver to support VCP firmware interface.
Set the encoder driver firmware type to 'VCP'. Allocate RC buffers using the VCP device.
Send the shared memory address to VCP and map the encoder VSI address
to the CPU address space using the VCP shared memory address.Signed-off-by Irui Wang <[email protected]>--- .../mediatek/vcodec/common/mtk_vcodec_fw.c | 6 +++++ .../mediatek/vcodec/common/mtk_vcodec_fw.h | 1 + .../vcodec/common/mtk_vcodec_fw_priv.h | 1 + .../vcodec/common/mtk_vcodec_fw_vcp.c | 6 +++++ .../vcodec/encoder/mtk_vcodec_enc_drv.c | 3 +++ .../vcodec/encoder/venc/venc_common_if.c | 23 ++++++++++++++- ---- .../mediatek/vcodec/encoder/venc_vpu_if.c | 14 ++++++++++- 7 files changed, 47 insertions(+), 7 deletions(-)diff --git
a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.cb/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.cindex0381acceda25..7a504f093bd8100644drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c +6
-0@@ -105,3 +105,9 @@ int mtk_vcodec_fw_get_type(struct mtk_vcodec_fw *fw)return fw->type; }EXPORT_SYMBOL_GPL (mtk_vcodec_fw_get_type); + +struct device *mtk_vcodec_fw_get_dev (struct mtk_vcodec_fw *fw) +{ +return fw->ops->get_fw_dev (fw); +} +EXPORT_SYMBOL_GPL (mtk_vcodec_fw_get_dev);diff --git
a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.hb/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.hindexe7304a7dd3e0..56c26b91651e100644drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +1
-0@@ -43,5 +43,6 @@ int mtk_vcodec_fw_ipi_send(struct mtk_vcodec_fw *fw, int id, int mtk_vcodec_fw_get_type(struct mtk_vcodec_fw *fw);int mtk_vcodec_fw_get_ipi (enum mtk_vcodec_fw_type type,int hw_id);int mtk_vcodec_fw_get_venc_ipi (enum mtk_vcodec_fw_type type); +struct device *mtk_vcodec_fw_get_dev (struct mtk_vcodec_fw *fw);#endif /* _MTK_VCODEC_FW_H_ */
diff --git a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_priv. h b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_priv. h
index0a2a9b010244..710c83c871f4100644
---
a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_priv. h
+++
b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_priv. hdrivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +1
-0@@ -29,6 +29,7 @@ struct mtk_vcodec_fw_ops {int (*ipi_send)(struct mtk_vcodec_fw *fw,int id,void *buf,unsigned int len,unsigned int wait);void (*release)(struct mtk_vcodec_fw *fw); +struct device *(*get_fw_dev)(struct mtk_vcodec_fw *fw); };#if IS_ENABLED (CONFIG_VIDEO_MEDIATEK_VCODEC_VPU )diff --git
a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vcp.cb/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vcp.cindex6b69ce44d4bb..2859fe78f67d100644
---a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vcp.c
+++b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vcp.cdrivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +5
-0@@ -500,6 +500,11 @@ static void mtk_vcodec_vcp_release(struct mtk_vcodec_fw *fw) } +static struct device *mtk_vcodec_vcp_get_fw_dev (struct mtk_vcodec_fw *fw) +{ +return fw->vcp->vcp_device->dev; +} +static const struct mtk_vcodec_fw_ops mtk_vcodec_vcp_msg = {drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +1
-0.load_firmware = mtk_vcodec_vcp_load_firmware, .get_vdec_capa = mtk_vcodec_vcp_get_vdec_capa,@@ -508,6 +513,7 @@ static const struct mtk_vcodec_fw_ops mtk_vcodec_vcp_msg = { .ipi_register = mtk_vcodec_vcp_set_ipi_register, .ipi_send = mtk_vcodec_vcp_ipi_send, .release = mtk_vcodec_vcp_release, + .get_fw_dev = mtk_vcodec_vcp_get_fw_dev, };struct
mtk_vcodec_fw*mtk_vcodec_fw_vcp_init(void *priv, enummtk_vcodec_fw_usefw_use)
diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv .c b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv .c
index4e4541b2fc8e..2f6ee0cd15e3100644
---
a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv .c
+++
b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv .cdrivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h static int mtk_vcodec_probe(struct · line 270
Quoted 9 lines
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +3
-0@@ -262,6 +262,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev) }else if (!of_property_read_u32 (pdev->dev.of_node,"mediatek,scp" , &rproc_phandle)) { fw_type =SCP ; + }else if (!of_property_read_u32 (pdev->dev.of_node,"mediatek,vcp" , + &rproc_phandle)) { + fw_type =VCP ;Similar comment on the patchset you depend on, its third firmware type, and time
to cleanup. Theof_device_get_match_data()should be sufficient for this simple
case, there is not reason for custom DT parsing here. PLace thefw_typein the
pdata, and moveof_device_get_match_data()call earlier.Please apply the same logic for the entire patchset. Every bit of information
that is purely static to your device is better placed in the pdata then through
addition of if/else conditions all over the place. The pdata can also have ops
in it, letting easily firmware specific code without having to do if/else
everywhere.
Quoted 1 line
Nicolas
I will clean up this if/else in next patch, and with the logic, I will review and modify the entire patch set if needed.
Thanks
Best Regards
Quoted 106 lines
Quoted 106 lines
drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +0
-0}else { dev_err(&pdev->dev, "[MTK VCODEC] Could not get vencIPI device");
return-ENODEV;
diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.cb/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c
index050b827f0fd0..d981155aeb8c100644
---
a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.c
+++
b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_common_if.cdrivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +6
-1@@ -480,8 +480,13 @@ static void venc_free_rc_buf(struct venc_inst *inst, {int i;struct device *dev; +struct mtk_vcodec_fw *fw = inst->ctx->dev->fw_handler; + +if (mtk_vcodec_fw_get_type (fw) ==VCP ) + dev =mtk_vcodec_fw_get_dev (fw); +else + dev = &inst->ctx->dev->plat_dev->dev; - dev = &inst->ctx->dev->plat_dev->dev;mtk_venc_mem_free (inst, dev, &bufs->rc_code);drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +11
-5for (i =0 ; i < core_num; i++)@@ -530,12 +535,18 @@ static int venc_alloc_rc_buf(struct venc_inst *inst, struct device *dev;void *tmp_va; - dev = &inst->ctx->dev->plat_dev->dev; -if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) -return -ENOMEM ; +if (mtk_vcodec_fw_get_type (fw) ==VCP ) { + dev =mtk_vcodec_fw_get_dev (fw); +if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) +return -ENOMEM ; + }else { + dev = &inst->ctx->dev->plat_dev->dev; +if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_code)) +return -ENOMEM ; - tmp_va =mtk_vcodec_fw_map_dm_addr (fw, bufs->rc_code.pa); -memcpy (bufs->rc_code.va, tmp_va, bufs->rc_code.size); + tmp_va =mtk_vcodec_fw_map_dm_addr (fw, bufs- >rc_code.pa); +memcpy (bufs->rc_code.va, tmp_va, bufs->rc_code.size); + }drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h +0
-0for (i =0 ; i < core_num; i++) {if (mtk_venc_mem_alloc (inst, dev, &bufs->rc_info[i]))diff --git
a/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.cb/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.cindex7772b8442ebc..0f4693e04a9f100644drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +10
-1@@ -8,13 +8,23 @@#include "venc_ipi_msg.h" #include "venc_vpu_if.h" +#define VSI_OFFSET_MASK 0x0FFFFFFF +static void handle_enc_init_msg (struct venc_vpu_inst *vpu,const void *data) {const struct venc_vpu_ipi_msg_init_comm *msg = data;struct mtk_vcodec_fw *fw = vpu->ctx->dev->fw_handler; +u64 pa_start, vsi_offset; vpu->inst_addr = msg->init_ack.vpu_inst_addr; - vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw, vpu->inst_addr); + +if (mtk_vcodec_fw_get_type (fw) ==VCP ) { + pa_start = (u64 )fw->vcp->iova_addr; + vsi_offset = (msg->vpu_vsi_addr &VSI_OFFSET_MASK ) - (pa_start &VSI_OFFSET_MASK ); + vpu->vsi =mtk_vcodec_fw_map_dm_addr (fw,ENCODER_MEM ) + vsi_offset; + }else { + vpu->vsi = mtk_vcodec_fw_map_dm_addr(fw, msg-Quoted 1 line
vpu_vsi_addr);drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +3
-0+ }/* Firmware version field value is unspecified on MT8173. */ if (mtk_vcodec_fw_get_type (fw) ==VPU )@@ -155,6 +165,8 @@ int vpu_enc_init(struct venc_vpu_inst *vpu) out.base.venc_inst = (unsigned long )vpu;if (MTK_ENC_DRV_IS_COMM (vpu->ctx)) { out.codec_type = vpu->ctx->q_data[MTK_Q_DATA_DST ].fmt- >fourcc; +if (mtk_vcodec_fw_get_type (vpu->ctx->dev->fw_handler) ==VCP ) + out.shared_iova = vpu->ctx->dev->fw_handler- >vcp->iova_addr;drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +0
-0msg_size =sizeof (struct venc_ap_ipi_msg_init_comm ); }else { msg_size =sizeof (struct venc_ap_ipi_msg_init );
PATCH v6 5/6 media: mediatek: encoder: Add a new platform data member
In reply to Irui WangAdd a new platform data member to indicate each encoder IC, so that the get chip name function by 'of_device_is_compatible' can be removed.
--- .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 22 ++----------------- .../vcodec/encoder/mtk_vcodec_enc_drv.c | 6 +++++ .../vcodec/encoder/mtk_vcodec_enc_drv.h | 2 ++ 3 files changed, 10 insertions(+), 20 deletions(-)
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +2 -20
@@ -198,33 +198,15 @@ static int vidioc_enum_fmt_vid_out(struct file *file, void *priv, pdata->num_output_formats); } -static int mtk_vcodec_enc_get_chip_name (struct mtk_vcodec_enc_ctx *ctx) -{ -struct device *dev = &ctx->dev->plat_dev->dev; - -if (of_device_is_compatible (dev->of_node,"mediatek,mt8173-vcodec-enc" )) -return 8173 ; -else if (of_device_is_compatible (dev->of_node,"mediatek,mt8183-vcodec-enc" )) -return 8183 ; -else if (of_device_is_compatible (dev->of_node,"mediatek,mt8192-vcodec-enc" )) -return 8192 ; -else if (of_device_is_compatible (dev->of_node,"mediatek,mt8195-vcodec-enc" )) -return 8195 ; -else if (of_device_is_compatible (dev->of_node,"mediatek,mt8188-vcodec-enc" )) -return 8188 ; -else -return 8173 ; -} -static int vidioc_venc_querycap (struct file *file,void *priv,struct v4l2_capability *cap) {struct mtk_vcodec_enc_ctx *ctx =file_to_enc_ctx (file); +const struct mtk_vcodec_enc_pdata *pdata = ctx->dev->venc_pdata;struct device *dev = &ctx->dev->plat_dev->dev; -int platform_name =mtk_vcodec_enc_get_chip_name (ctx);strscpy (cap->driver, dev->driver->name,sizeof (cap->driver)); -snprintf (cap->card,sizeof (cap->card),"MT%d video encoder" , platform_name); +snprintf (cap->card,sizeof (cap->card),"MT%d video encoder" , pdata->venc_model_num);return 0 ; }
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c +6 -0
@@ -390,6 +390,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) }static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata = { + .venc_model_num =8173 , .capture_formats = mtk_video_formats_capture_h264, .num_capture_formats =ARRAY_SIZE (mtk_video_formats_capture_h264), .output_formats = mtk_video_formats_output,
@@ -400,6 +401,7 @@ static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata = { };static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata = { + .venc_model_num =8173 , .capture_formats = mtk_video_formats_capture_vp8, .num_capture_formats =ARRAY_SIZE (mtk_video_formats_capture_vp8), .output_formats = mtk_video_formats_output,
@@ -410,6 +412,7 @@ static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata = { };static const struct mtk_vcodec_enc_pdata mt8183_pdata = { + .venc_model_num =8183 , .uses_ext = true, .capture_formats = mtk_video_formats_capture_h264, .num_capture_formats =ARRAY_SIZE (mtk_video_formats_capture_h264),
@@ -421,6 +424,7 @@ static const struct mtk_vcodec_enc_pdata mt8183_pdata = { };static const struct mtk_vcodec_enc_pdata mt8188_pdata = { + .venc_model_num =8188 , .uses_ext = true, .capture_formats = mtk_video_formats_capture_h264, .num_capture_formats =ARRAY_SIZE (mtk_video_formats_capture_h264),
@@ -433,6 +437,7 @@ static const struct mtk_vcodec_enc_pdata mt8188_pdata = { };static const struct mtk_vcodec_enc_pdata mt8192_pdata = { + .venc_model_num =8192 , .uses_ext = true, .capture_formats = mtk_video_formats_capture_h264, .num_capture_formats =ARRAY_SIZE (mtk_video_formats_capture_h264),
@@ -444,6 +449,7 @@ static const struct mtk_vcodec_enc_pdata mt8192_pdata = { };static const struct mtk_vcodec_enc_pdata mt8195_pdata = { + .venc_model_num =8195 , .uses_ext = true, .capture_formats = mtk_video_formats_capture_h264, .num_capture_formats =ARRAY_SIZE (mtk_video_formats_capture_h264),
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h +2 -0
@@ -21,6 +21,7 @@/** * struct mtk_vcodec_enc_pdata - compatible data for each IC * +* @venc_model_num: encoder model number * @uses_ext: whether the encoder uses the extended firmware messaging format * @min_bitrate: minimum supported encoding bitrate * @max_bitrate: maximum supported encoding bitrate
@@ -33,6 +34,7 @@* @uses_common_fw_iface: whether the encoder uses common driver interface */ struct mtk_vcodec_enc_pdata { +u16 venc_model_num;bool uses_ext;u64 min_bitrate;u64 max_bitrate;
Signature · 1 line
2.45.2
PATCH v6 6/6 media: mediatek: encoder: Add MT8196 encoder compatible data
In reply to Irui WangMT8196 encoder use common firmware interface, add compatible data to support MT8196 encoding, and need set dma mask to support 34bit.
--- .../vcodec/encoder/mtk_vcodec_enc_drv.c | 19 +++++++++++++++++++ .../vcodec/encoder/mtk_vcodec_enc_drv.h | 2 ++ 2 files changed, 21 insertions(+)
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c +19 -0
@@ -20,6 +20,8 @@#include "mtk_vcodec_enc_pm.h" #include "../common/mtk_vcodec_intr.h" +#define VENC_DMA_BIT_MASK 34 +static const struct mtk_video_fmt mtk_video_formats_output[] = { { .fourcc =V4L2_PIX_FMT_NV12M ,
@@ -309,6 +311,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev) goto err_res; } +if (dev->venc_pdata->set_dma_bit_mask) +dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (VENC_DMA_BIT_MASK )); +mutex_init (&dev->enc_mutex);mutex_init (&dev->dev_mutex);spin_lock_init (&dev->dev_ctx_lock);
@@ -460,6 +465,19 @@ static const struct mtk_vcodec_enc_pdata mt8195_pdata = { .core_id = VENC_SYS, }; +static const struct mtk_vcodec_enc_pdata mt8196_pdata = { + .venc_model_num =8196 , + .capture_formats = mtk_video_formats_capture_h264, + .num_capture_formats =ARRAY_SIZE (mtk_video_formats_capture_h264), + .output_formats = mtk_video_formats_output, + .num_output_formats =ARRAY_SIZE (mtk_video_formats_output), + .min_bitrate =64 , + .max_bitrate =100000000 , + .core_id =VENC_SYS , + .uses_common_fw_iface = true, + .set_dma_bit_mask = true, +}; +static const struct of_device_id mtk_vcodec_enc_match[] = { {.compatible ="mediatek,mt8173-vcodec-enc" , .data = &mt8173_avc_pdata},
@@ -469,6 +487,7 @@ static const struct of_device_id mtk_vcodec_enc_match[] = { {.compatible = "mediatek,mt8188-vcodec-enc", .data = &mt8188_pdata}, {.compatible = "mediatek,mt8192-vcodec-enc", .data = &mt8192_pdata}, {.compatible = "mediatek,mt8195-vcodec-enc", .data = &mt8195_pdata}, + {.compatible = "mediatek,mt8196-vcodec-enc", .data = &mt8196_pdata}, {}, };MODULE_DEVICE_TABLE (of, mtk_vcodec_enc_match);
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h +2 -0
@@ -32,6 +32,7 @@* @core_id: stand for h264 or vp8 encode index * @uses_34bit: whether the encoder uses 34-bit iova * @uses_common_fw_iface: whether the encoder uses common driver interface +* @set_dma_bit_mask: whether the encoder need set extra DMA bit mask */ struct mtk_vcodec_enc_pdata {u16 venc_model_num;
@@ -45,6 +46,7 @@ struct mtk_vcodec_enc_pdata {u8 core_id;bool uses_34bit;bool uses_common_fw_iface; +bool set_dma_bit_mask; };/*
Signature · 1 line
2.45.2