[V5,5/8] media: mtk-jpegdec: add jpeg decode worker interface

[AngeloGioacchino Del Regno]

Il 16/07/22 11:34, Irui Wang ha scritto:
> From: kyrie wu <kyrie.wu at mediatek.com>
> 
> Add jpeg decoding worker to ensure that three HWs
> run in parallel in MT8195.
> 
> Signed-off-by: kyrie wu <kyrie.wu at mediatek.com>
> Signed-off-by: irui wang <irui.wang at mediatek.com>
> 
> ---
>   .../platform/mediatek/jpeg/mtk_jpeg_core.c    | 172 ++++++++++++++++++
>   .../platform/mediatek/jpeg/mtk_jpeg_core.h    |   6 +
>   .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c  |  39 ++--
>   3 files changed, 205 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> index a9e8be976bb0..65b963ba0d6f 100644
> --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> @@ -1100,8 +1100,177 @@ static void mtk_jpeg_multicore_enc_device_run(void *priv)
>   	queue_work(jpeg->workqueue, &ctx->jpeg_work);
>   }
>   
> +static int mtk_jpegdec_get_hw(struct mtk_jpeg_ctx *ctx)
> +{
> +	struct mtk_jpegdec_comp_dev *comp_jpeg;
> +	struct mtk_jpeg_dev *jpeg = ctx->jpeg;
> +	unsigned long flags;
> +	int hw_id = -1;
> +	int i;
> +
> +	spin_lock_irqsave(&jpeg->hw_lock, flags);
> +	for (i = 0; i < MTK_JPEGDEC_HW_MAX; i++) {
> +		comp_jpeg = jpeg->dec_hw_dev[i];
> +		if (comp_jpeg->hw_state == MTK_JPEG_HW_IDLE) {
> +			hw_id = i;
> +			comp_jpeg->hw_state = MTK_JPEG_HW_BUSY;
> +			break;
> +		}
> +	}
> +	spin_unlock_irqrestore(&jpeg->hw_lock, flags);
> +
> +	return hw_id;
> +}
> +
> +static int mtk_jpegdec_put_hw(struct mtk_jpeg_dev *jpeg, int hw_id)
> +{
> +	unsigned long flags;
> +
> +	spin_lock_irqsave(&jpeg->hw_lock, flags);
> +	jpeg->dec_hw_dev[hw_id]->hw_state =
> +		MTK_JPEG_HW_IDLE;
> +	spin_unlock_irqrestore(&jpeg->hw_lock, flags);
> +
> +	return 0;
> +}
> +
> +static int mtk_jpegdec_set_hw_param(struct mtk_jpeg_ctx *ctx,
> +				    int hw_id,
> +				    struct vb2_v4l2_buffer *src_buf,
> +				    struct vb2_v4l2_buffer *dst_buf)
> +{
> +	struct mtk_jpegdec_comp_dev *jpeg =
> +		ctx->jpeg->dec_hw_dev[hw_id];
> +
> +	jpeg->hw_param.curr_ctx = ctx;
> +	jpeg->hw_param.src_buffer = src_buf;
> +	jpeg->hw_param.dst_buffer = dst_buf;
> +
> +	return 0;
> +}
> +
> +static void mtk_jpegdec_worker(struct work_struct *work)
> +{
> +	struct mtk_jpeg_ctx *ctx = container_of(work, struct mtk_jpeg_ctx,
> +		jpeg_work);
> +	struct mtk_jpegdec_comp_dev *comp_jpeg[MTK_JPEGDEC_HW_MAX];
> +	enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
> +	struct mtk_jpeg_src_buf *jpeg_src_buf, *jpeg_dst_buf;
> +	struct vb2_v4l2_buffer *src_buf, *dst_buf;
> +	struct mtk_jpeg_dev *jpeg = ctx->jpeg;
> +	int ret, i, hw_id = 0;
> +	struct mtk_jpeg_bs bs;
> +	struct mtk_jpeg_fb fb;
> +	unsigned long flags;
> +
> +	for (i = 0; i < MTK_JPEGDEC_HW_MAX; i++)
> +		comp_jpeg[i] = jpeg->dec_hw_dev[i];
> +
> +retry_select:

Please ensure that we have a max retries limit to avoid an infinite loop.

> +	hw_id = mtk_jpegdec_get_hw(ctx);
> +	if (hw_id < 0) {
> +		ret = wait_event_interruptible_timeout(jpeg->dec_hw_wq,
> +						       atomic_read(&jpeg->dechw_rdy) > 0,
> +						       MTK_JPEG_HW_TIMEOUT_MSEC);
> +		if (ret != 0) {
> +			dev_err(jpeg->dev, "%s : %d, all HW are busy\n",
> +				__func__, __LINE__);
> +			v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
> +			return;
> +		}
> + > +		goto retry_select;
> +	}
> +
> +	atomic_dec(&jpeg->dechw_rdy);
> +	src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
> +	if (!src_buf)
> +		goto getbuf_fail;
> +
> +	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
> +	if (!dst_buf)
> +		goto getbuf_fail;
> +
> +	v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> +	v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
> +
> +	v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
> +	jpeg_src_buf = mtk_jpeg_vb2_to_srcbuf(&src_buf->vb2_buf);
> +	jpeg_dst_buf = mtk_jpeg_vb2_to_srcbuf(&dst_buf->vb2_buf);
> +
> +	if (mtk_jpeg_check_resolution_change(ctx,
> +					     &jpeg_src_buf->dec_param)) {
> +		mtk_jpeg_queue_src_chg_event(ctx);
> +		ctx->state = MTK_JPEG_SOURCE_CHANGE;
> +		goto dec_end;
> +	}
> +
> +	jpeg_src_buf->curr_ctx = ctx;
> +	jpeg_src_buf->frame_num = ctx->total_frame_num;
> +	jpeg_dst_buf->curr_ctx = ctx;
> +	jpeg_dst_buf->frame_num = ctx->total_frame_num;
> +	ctx->total_frame_num++;
> +
> +	mtk_jpegdec_set_hw_param(ctx, hw_id, src_buf, dst_buf);
> +	ret = pm_runtime_get_sync(comp_jpeg[hw_id]->dev);
> +	if (ret < 0) {
> +		dev_err(jpeg->dev, "%s : %d, pm_runtime_get_sync fail !!!\n",
> +			__func__, __LINE__);
> +		goto dec_end;
> +	}
> +
> +	ret = clk_prepare_enable(comp_jpeg[hw_id]->jdec_clk.clks->clk);
> +	if (ret) {
> +		dev_err(jpeg->dev, "%s : %d, jpegdec clk_prepare_enable fail\n",
> +			__func__, __LINE__);
> +		goto clk_end;
> +	}
> +
> +	schedule_delayed_work(&comp_jpeg[hw_id]->job_timeout_work,
> +			      msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC));
> +
> +	mtk_jpeg_set_dec_src(ctx, &src_buf->vb2_buf, &bs);
> +	if (mtk_jpeg_set_dec_dst(ctx,
> +				 &jpeg_src_buf->dec_param,
> +				 &dst_buf->vb2_buf, &fb)) {
> +		dev_err(jpeg->dev, "%s : %d, mtk_jpeg_set_dec_dst fail\n",
> +			__func__, __LINE__);
> +		goto setdst_end;
> +	}
> +
> +	spin_lock_irqsave(&comp_jpeg[hw_id]->hw_lock, flags);
> +	mtk_jpeg_dec_reset(comp_jpeg[hw_id]->reg_base);
> +	mtk_jpeg_dec_set_config(jpeg->reg_base,
> +				&jpeg_src_buf->dec_param,
> +				&bs,
> +				&fb);
> +	mtk_jpeg_dec_start(comp_jpeg[hw_id]->reg_base);
> +	v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
> +	spin_unlock_irqrestore(&comp_jpeg[hw_id]->hw_lock, flags);
> +
> +	return;
> +
> +setdst_end:
> +	clk_disable_unprepare(comp_jpeg[hw_id]->jdec_clk.clks->clk);
> +clk_end:
> +	pm_runtime_put(comp_jpeg[hw_id]->dev);
> +dec_end:
> +	v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> +	v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
> +	v4l2_m2m_buf_done(src_buf, buf_state);
> +	v4l2_m2m_buf_done(dst_buf, buf_state);
> +getbuf_fail:
> +	atomic_inc(&jpeg->dechw_rdy);
> +	mtk_jpegdec_put_hw(jpeg, hw_id);
> +	v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
> +}
> +
>   static void mtk_jpeg_multicore_dec_device_run(void *priv)
>   {
> +	struct mtk_jpeg_ctx *ctx = priv;
> +	struct mtk_jpeg_dev *jpeg = ctx->jpeg;
> +
> +	queue_work(jpeg->workqueue, &ctx->jpeg_work);


In the previous commit, I asked why this function was empty: I see you're
filling it in right now, so please add the MT8195 compatibles after this
commit, or later.

>   }
>   
>   static void mtk_jpeg_dec_device_run(void *priv)
> @@ -1377,6 +1546,9 @@ static int mtk_jpeg_open(struct file *file)
>   	if (jpeg->is_jpgenc_multihw)
>   		INIT_WORK(&ctx->jpeg_work, mtk_jpegenc_worker);
>   
> +	if (jpeg->is_jpgdec_multihw)
> +		INIT_WORK(&ctx->jpeg_work, mtk_jpegdec_worker);
> +
>   	INIT_LIST_HEAD(&ctx->dst_done_queue);
>   	spin_lock_init(&ctx->done_queue_lock);
>   	v4l2_fh_init(&ctx->fh, vfd);
> diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> index ddfe2b4c48b3..ef9a3e1fdf60 100644
> --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> @@ -171,6 +171,9 @@ struct mtk_jpegdec_comp_dev {
>   	int jpegdec_irq;
>   	struct delayed_work job_timeout_work;
>   	struct mtk_jpeg_hw_param hw_param;
> +	enum mtk_jpeg_hw_state hw_state;
> +	//spinlock protecting the hw device resource

C-style comments please.

> +	spinlock_t hw_lock;
>   };
>   
>   /**

Regards,
Angelo