media: mtk-jpeg: Fixes jpeghw multi-core judgement
Subsystems (3)
PATCH v5 1/1 media: mtk-jpeg: Fixes jpeghw multi-core judgement
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]>
Reviewed-by AngeloGioacchino Del Regno <[email protected]>
--- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 4 +++- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +3 -1
@@ -1694,7 +1694,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)return -EINVAL ; } -if (list_empty (&pdev->dev.devres_head)) { +if (!jpeg->variant->multi_core) {INIT_DELAYED_WORK (&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work);
@@ -1888,6 +1888,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, + .multi_core = true, };static const struct mtk_jpeg_variant mtk8195_jpegdec_drvdata = {
@@ -1899,6 +1900,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, + .multi_core = true, };#if defined(CONFIG_OF )
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h +2 -0
@@ -60,6 +60,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 +* @multi_core: mark jpeg hw is multi_core or not */ struct mtk_jpeg_variant {struct clk_bulk_data *clks;
@@ -74,6 +75,7 @@ struct mtk_jpeg_variant {const struct v4l2_ioctl_ops *ioctl_ops;u32 out_q_default_fourcc;u32 cap_q_default_fourcc; +bool multi_core; };struct mtk_jpeg_src_buf {
Signature · 1 line
2.18.0