media: jpeg: Fixes multi-hw judgement
Subsystems (3)
PATCH v3 1/1 media: jpeg: Fixes multi-hw judgement
From: kyrie wu <[email protected]>
some chips have multi-hw, but others have only one, modify the condition of multi-hw judgement
--- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 4 +++- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +3 -1
@@ -1692,7 +1692,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)return -EINVAL ; } -if (list_empty (&pdev->dev.devres_head)) { +if (!jpeg->variant->hw_arch) {INIT_DELAYED_WORK (&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work);
@@ -1885,6 +1885,7 @@ static struct mtk_jpeg_variant mtk8195_jpegenc_drvdata = { .ioctl_ops = &mtk_jpeg_enc_ioctl_ops, .out_q_default_fourcc = V4L2_PIX_FMT_YUYV, .cap_q_default_fourcc = V4L2_PIX_FMT_JPEG, + .hw_arch = MTK_JPEG_HW_MULTI_CORE, };static const struct mtk_jpeg_variant mtk8195_jpegdec_drvdata = {
@@ -1896,6 +1897,7 @@ static const struct mtk_jpeg_variant mtk8195_jpegdec_drvdata = { .ioctl_ops = &mtk_jpeg_dec_ioctl_ops, .out_q_default_fourcc = V4L2_PIX_FMT_JPEG, .cap_q_default_fourcc = V4L2_PIX_FMT_YUV420M, + .hw_arch = MTK_JPEG_HW_MULTI_CORE, };#if defined(CONFIG_OF )
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h +12 -0
@@ -46,6 +46,16 @@ enum mtk_jpeg_ctx_state { MTK_JPEG_SOURCE_CHANGE, }; +/** +* enum mtk_jpeg_hw_arch - arch of the jpeg hw +* @MTK_JPEG_HW_SINGLE_CORE: jpeg hw is single core +* @MTK_JPEG_HW_MULTI_CORE: jpeg hw is mluti-core +*/ +enum mtk_jpeg_hw_arch { +MTK_JPEG_HW_SINGLE_CORE =0 , +MTK_JPEG_HW_MULTI_CORE =1 , +}; +/** * struct mtk_jpeg_variant - mtk jpeg driver variant * @clks: clock names
@@ -60,6 +70,7 @@ enum mtk_jpeg_ctx_state {* @ioctl_ops: the callback of jpeg v4l2_ioctl_ops * @out_q_default_fourcc: output queue default fourcc * @cap_q_default_fourcc: capture queue default fourcc +* @hw_arch: mark jpeg hw arch */ struct mtk_jpeg_variant {struct clk_bulk_data *clks;
@@ -74,6 +85,7 @@ struct mtk_jpeg_variant {const struct v4l2_ioctl_ops *ioctl_ops;u32 out_q_default_fourcc;u32 cap_q_default_fourcc; +enum mtk_jpeg_hw_arch hw_arch; };struct mtk_jpeg_src_buf {
Signature · 1 line
2.18.0
Il 28/12/22 08:00, Irui Wang ha scritto:
Quoted 9 lines
From: kyrie wu <[email protected]>
some chips have multi-hw, but others have only one, modify the condition of multi-hw judgement
Fixes 934e8bccac95 ("mtk-jpegenc: support jpegenc multi-hardware")Signed-off-by kyrie wu <[email protected]>Signed-off-by irui wang <[email protected]>
Please clarify the commit title, as "media: jpeg:" is generic, but you're touching a driver for MediaTek's JPEG HW dec/encoder.
Change it to "media: mtk-jpeg: Fix jpeghw multi-core judgement", after which:
Regards,
Angelo
Quoted 15 lines · AngeloGioacchino Del Regno
Il 28/12/22 08:00, Irui Wang ha scritto:
Quoted 9 lines
From: kyrie wu <[email protected]>
some chips have multi-hw, but others have only one, modify the condition of multi-hw judgement
Fixes 934e8bccac95 ("mtk-jpegenc: support jpegenc multi-hardware")Signed-off-by kyrie wu <[email protected]>Signed-off-by irui wang <[email protected]>Please clarify the commit title, as "media: jpeg:" is generic, but you're
touching a driver for MediaTek's JPEG HW dec/encoder.
Quoted 8 lines
Change it to "media: mtk-jpeg: Fix jpeghw multi-core judgement", after which:
Reviewed-by: AngeloGioacchino Del Regno <
[email protected]>Regards,
Angelo
Hi Angelo,
Thanks for your advices, I will fix it in the next version.
Thanks a lot.
Regards,
Kyrie.