Support H264 4K on MT8192
Subsystems (3)
v2 cover Support H264 4K on MT8192
Add MT8192 H264 venc driver and support H264 4K encoding on MT8192.
---
This patch dependents on
"dt-bindings: media: mtk-vcodec: Separating mtk vcodec encoder node" [1]
We need "core_id" variable in device private data to indicate current encoder driver.
Please also accept this patch together with [1].
http://lists.infradead.org/pipermail/linux-mediatek/2021-March/022432.html
---
Change since v1:
- remove encoder device tree example in dt-bindings
---
Irui Wang (5):
dt-bindings: media: mtk-vcodec: Add dma-ranges property
media: mtk-vcodec: Support 4GB~8GB range iova space for venc
dt-bindings: media: mtk-vcodec: Add binding for MT8192 VENC
media: mtk-vcodec: Add MT8192 H264 venc driver
media: mtk-vcodec: Support H264 4K encoding on MT8192
.../bindings/media/mediatek-vcodec.txt | 3 + .../platform/mtk-vcodec/mtk_vcodec_drv.h | 1 + .../platform/mtk-vcodec/mtk_vcodec_enc.c | 58 ++++++++++++++----- .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 18 ++++++ .../platform/mtk-vcodec/venc/venc_h264_if.c | 4 ++ 5 files changed, 69 insertions(+), 15 deletions(-)
Signature · 5 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 1/5 dt-bindings: media: mtk-vcodec: Add dma-ranges property
The mt8192 iommu support 0~16GB iova. We separate it to four banks:
0~4G; 4G~8G; 8G~12G; 12G~16G.
The "dma-ranges" could be used to adjust the bank we locate. If we don't set this property. The default range always is 0~4G.
Here we don't have actual bus/parent concept here. And the iova requirement is for our HW. Thus put the property in our node.
--- Documentation/devicetree/bindings/media/mediatek-vcodec.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/media/mediatek-vcodec.txt +2 -0
@@ -22,6 +22,8 @@ Required properties: - iommus : should point to the respective IOMMU block with master port as argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt for details. +- dma-ranges : describes how the physical address space of the IOMMU maps + to memory. One of the two following nodes: - mediatek,vpu : the node of the video processor unit, if using VPU. - mediatek,scp : the node of the SCP unit, if using SCP.
Signature · 5 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 2/5 media: mtk-vcodec: Support 4GB~8GB range iova space for venc
In reply to Irui WangUses the dma_set_mask_and_coherent helper to set venc DMA bit mask to support 4GB~8GB range iova space.
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +3 -0
@@ -361,6 +361,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev) goto err_event_workq; } +if (of_get_property (pdev->dev.of_node,"dma-ranges" ,NULL )) +dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (34 )); + ret =video_register_device (vfd_enc,VFL_TYPE_VIDEO ,1 );if (ret) {mtk_v4l2_err ("Failed to register video device" );
Signature · 1 line
2.18.0
PATCH v2 3/5 dt-bindings: media: mtk-vcodec: Add binding for MT8192 VENC
In reply to Irui WangUpdates binding document for mt8192 encoder driver.
--- Documentation/devicetree/bindings/media/mediatek-vcodec.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/media/mediatek-vcodec.txt +1 -0
@@ -9,6 +9,7 @@ Required properties: "mediatek,mt8173-vcodec-enc" for mt8173 avc encoder. "mediatek,mt8183-vcodec-enc" for MT8183 encoder. "mediatek,mt8173-vcodec-dec" for MT8173 decoder. + "mediatek,mt8192-vcodec-enc" for MT8192 encoder. - reg : Physical base address of the video codec registers and length of memory mapped region. - interrupts : interrupt number to the cpu.
Signature · 1 line
2.18.0
Re: [PATCH v2, 3/5] dt-bindings: media: mtk-vcodec: Add binding for MT8192 VENC
Quoted 7 lines · Irui Wang
Updates binding document for mt8192 encoder driver.
Signed-off-by Irui Wang <[email protected]>--- Documentation/devicetree/bindings/media/mediatek-vcodec.txt | 1 + 1 file changed, 1 insertion(+)
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 4/5 media: mtk-vcodec: Add MT8192 H264 venc driver
In reply to Irui WangAdd MT8192 venc driver's compatible and device private data.
--- .../media/platform/mtk-vcodec/mtk_vcodec_drv.h | 1 + .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+)
drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +1 -0
@@ -302,6 +302,7 @@ struct mtk_vcodec_ctx {enum mtk_chip {MTK_MT8173 ,MTK_MT8183 , +MTK_MT8192 , };/**
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +15 -0
@@ -425,12 +425,27 @@ static const struct mtk_vcodec_enc_pdata mt8183_pdata = { .core_id = VENC_SYS, }; +static const struct mtk_vcodec_enc_pdata mt8192_pdata = { + .chip =MTK_MT8192 , + .uses_ext = true, +/* MT8192 supports the same capture formats as MT8183*/ + .capture_formats = mtk_video_formats_capture_mt8183, + .num_capture_formats =ARRAY_SIZE (mtk_video_formats_capture_mt8183), +/* MT8192 supports the same output formats as MT8173 */ + .output_formats = mtk_video_formats_output_mt8173, + .num_output_formats =ARRAY_SIZE (mtk_video_formats_output_mt8173), + .min_bitrate =64 , + .max_bitrate =100000000 , + .core_id =VENC_SYS , +}; +static const struct of_device_id mtk_vcodec_enc_match[] = { {.compatible ="mediatek,mt8173-vcodec-enc" , .data = &mt8173_avc_pdata}, {.compatible ="mediatek,mt8173-vcodec-enc-vp8" , .data = &mt8173_vp8_pdata}, {.compatible ="mediatek,mt8183-vcodec-enc" , .data = &mt8183_pdata}, + {.compatible ="mediatek,mt8192-vcodec-enc" , .data = &mt8192_pdata}, {}, };MODULE_DEVICE_TABLE (of, mtk_vcodec_enc_match);
Signature · 1 line
2.18.0
PATCH v2 5/5 media: mtk-vcodec: Support H264 4K encoding on MT8192
In reply to Irui WangSupports H264 4K (3840x2176) and level 5.1 encoding on MT8192.
--- .../platform/mtk-vcodec/mtk_vcodec_enc.c | 58 ++++++++++++++----- .../platform/mtk-vcodec/venc/venc_h264_if.c | 4 ++ 2 files changed, 47 insertions(+), 15 deletions(-)
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +43 -15
@@ -21,12 +21,16 @@#define MTK_VENC_MIN_H 128U#define MTK_VENC_MAX_W 1920U#define MTK_VENC_MAX_H 1088U +#define MTK_VENC_4K_MAX_W 3840U +#define MTK_VENC_4K_MAX_H 2176U +#define DFT_CFG_WIDTH MTK_VENC_MIN_W#define DFT_CFG_HEIGHT MTK_VENC_MIN_H#define MTK_MAX_CTRLS_HINT 20#define MTK_DEFAULT_FRAMERATE_NUM 1001#define MTK_DEFAULT_FRAMERATE_DENOM 30000 +#define MTK_VENC_4K_CAPABILITY_ENABLE BIT(0)static void mtk_venc_worker (struct work_struct *work);
@@ -151,18 +155,23 @@ static int vidioc_enum_framesizes(struct file *file, void *fh, struct v4l2_frmsizeenum *fsize) {const struct mtk_video_fmt *fmt; +struct mtk_vcodec_ctx *ctx =fh_to_ctx (fh);if (fsize->index !=0 )return -EINVAL ; fmt =mtk_venc_find_format (fsize->pixel_format, -fh_to_ctx (fh)->dev->venc_pdata); + ctx->dev->venc_pdata);if (!fmt)return -EINVAL ; fsize->type =V4L2_FRMSIZE_TYPE_STEPWISE ; fsize->stepwise = mtk_venc_framesizes; +if (ctx->dev->enc_capability &MTK_VENC_4K_CAPABILITY_ENABLE ) { + fsize->stepwise.max_width =MTK_VENC_4K_MAX_W ; + fsize->stepwise.max_height =MTK_VENC_4K_MAX_H ; + }return 0 ; }
@@ -248,7 +257,7 @@ static struct mtk_q_data *mtk_venc_get_q_data(struct mtk_vcodec_ctx *ctx,/* V4L2 specification suggests the driver corrects the format struct if any of * the dimensions is unsupported */ -static int vidioc_try_fmt (struct v4l2_format *f, +static int vidioc_try_fmt (struct mtk_vcodec_ctx *ctx,struct v4l2_format *f,const struct mtk_video_fmt *fmt) {struct v4l2_pix_format_mplane *pix_fmt_mp = &f->fmt.pix_mp;
@@ -260,13 +269,22 @@ static int vidioc_try_fmt(struct v4l2_format *f, pix_fmt_mp->plane_fmt[0 ].bytesperline =0 ; }else if (f->type ==V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) {int tmp_w, tmp_h; +unsigned int max_width, max_height; + +if (ctx->dev->enc_capability &MTK_VENC_4K_CAPABILITY_ENABLE ) { + max_width =MTK_VENC_4K_MAX_W ; + max_height =MTK_VENC_4K_MAX_H ; + }else { + max_width =MTK_VENC_MAX_W ; + max_height =MTK_VENC_MAX_H ; + } pix_fmt_mp->height =clamp (pix_fmt_mp->height,MTK_VENC_MIN_H , -MTK_VENC_MAX_H ); + max_height); pix_fmt_mp->width =clamp (pix_fmt_mp->width,MTK_VENC_MIN_W , -MTK_VENC_MAX_W ); + max_width);/* find next closer width align 16, heign align 32, size align * 64 rectangle
@@ -275,16 +293,16 @@ static int vidioc_try_fmt(struct v4l2_format *f, tmp_h = pix_fmt_mp->height;v4l_bound_align_image (&pix_fmt_mp->width,MTK_VENC_MIN_W , -MTK_VENC_MAX_W ,4 , + max_width,4 , &pix_fmt_mp->height,MTK_VENC_MIN_H , -MTK_VENC_MAX_H ,5 ,6 ); + max_height,5 ,6 );if (pix_fmt_mp->width < tmp_w && - (pix_fmt_mp->width +16 ) <=MTK_VENC_MAX_W ) + (pix_fmt_mp->width +16 ) <= max_width) pix_fmt_mp->width +=16 ;if (pix_fmt_mp->height < tmp_h && - (pix_fmt_mp->height +32 ) <=MTK_VENC_MAX_H ) + (pix_fmt_mp->height +32 ) <= max_height) pix_fmt_mp->height +=32 ; mtk_v4l2_debug(0,
@@ -405,7 +423,7 @@ static int vidioc_venc_s_fmt_cap(struct file *file, void *priv, } q_data->fmt = fmt; - ret =vidioc_try_fmt (f, q_data->fmt); + ret =vidioc_try_fmt (ctx, f, q_data->fmt);if (ret)return ret;
@@ -478,7 +496,7 @@ static int vidioc_venc_s_fmt_out(struct file *file, void *priv, q_data->visible_width = f->fmt.pix_mp.width; q_data->visible_height = f->fmt.pix_mp.height; q_data->fmt = fmt; - ret =vidioc_try_fmt (f, q_data->fmt); + ret =vidioc_try_fmt (ctx, f, q_data->fmt);if (ret)return ret;
@@ -553,7 +571,7 @@ static int vidioc_try_fmt_vid_cap_mplane(struct file *file, void *priv, f->fmt.pix_mp.quantization = ctx->quantization; f->fmt.pix_mp.xfer_func = ctx->xfer_func; -return vidioc_try_fmt (f, fmt); +return vidioc_try_fmt (ctx, f, fmt); } static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv,
@@ -575,7 +593,7 @@ static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv, f->fmt.pix_mp.xfer_func =V4L2_XFER_FUNC_DEFAULT ; } -return vidioc_try_fmt (f, fmt); +return vidioc_try_fmt (ctx, f, fmt); } static int vidioc_venc_g_selection(struct file *file, void *priv,
@@ -1247,9 +1265,19 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx)v4l2_ctrl_new_std_menu (handler, ops,V4L2_CID_MPEG_VIDEO_H264_PROFILE ,V4L2_MPEG_VIDEO_H264_PROFILE_HIGH ,0 ,V4L2_MPEG_VIDEO_H264_PROFILE_HIGH ); -v4l2_ctrl_new_std_menu (handler, ops,V4L2_CID_MPEG_VIDEO_H264_LEVEL , -V4L2_MPEG_VIDEO_H264_LEVEL_4_2 , -0 ,V4L2_MPEG_VIDEO_H264_LEVEL_4_0 ); + +if (ctx->dev->enc_capability &MTK_VENC_4K_CAPABILITY_ENABLE ) { +v4l2_ctrl_new_std_menu (handler, ops, +V4L2_CID_MPEG_VIDEO_H264_LEVEL , +V4L2_MPEG_VIDEO_H264_LEVEL_5_1 , +0 ,V4L2_MPEG_VIDEO_H264_LEVEL_4_0 ); + }else { +v4l2_ctrl_new_std_menu (handler, ops, +V4L2_CID_MPEG_VIDEO_H264_LEVEL , +V4L2_MPEG_VIDEO_H264_LEVEL_4_2 , +0 ,V4L2_MPEG_VIDEO_H264_LEVEL_4_0 ); + } +if (handler->error) {mtk_v4l2_err ("Init control handler fail %d" , handler->error);
drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +4 -0
@@ -215,6 +215,10 @@ static unsigned int h264_get_level(struct venc_h264_inst *inst,return 41 ;case V4L2_MPEG_VIDEO_H264_LEVEL_4_2 :return 42 ; +case V4L2_MPEG_VIDEO_H264_LEVEL_5_0 : +return 50 ; +case V4L2_MPEG_VIDEO_H264_LEVEL_5_1 : +return 51 ;default :mtk_vcodec_debug (inst,"unsupported level %d" , level);return 31 ;
Signature · 1 line
2.18.0