[PATCH V6, 4/5] media: mtk-jpegenc: add jpeg encode worker interface
kyrie.wu
kyrie.wu at mediatek.com
Thu Jan 6 00:03:35 PST 2022
On Fri, 2021-12-03 at 16:29 +0100, Ricardo Ribalda wrote:
> kyrie.wu wrote:
>
> > Add jpeg encoding worker to ensure that two HWs
> > run in parallel in MT8195.
>
> Have you considered using a semaphore initialized to two to arbitrate
> this?
I will consider your suggestion. Thanks.
>
> >
> > Signed-off-by: kyrie.wu <kyrie.wu at mediatek.com>
> > ---
> > V6: no change
> > ---
> > drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 180
> > +++++++++++++++++++---
> > drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 11 ++
> > drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 17 ++
> > 3 files changed, 188 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> > b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> > index da7eb84..80a6c1a 100644
> > --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> > +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> > @@ -110,6 +110,9 @@ struct mtk_jpeg_src_buf {
> > struct vb2_v4l2_buffer b;
> > struct list_head list;
> > struct mtk_jpeg_dec_param dec_param;
> > +
> > + struct mtk_jpeg_ctx *curr_ctx;
> > + u32 frame_num;
> > };
> >
> > static int debug;
> > @@ -908,38 +911,148 @@ static int mtk_jpeg_set_dec_dst(struct
> > mtk_jpeg_ctx *ctx,
> > return 0;
> > }
> >
> > -static void mtk_jpeg_enc_device_run(void *priv)
> > +static int mtk_jpegenc_select_hw(struct mtk_jpeg_ctx *ctx)
> > {
> > - struct mtk_jpeg_ctx *ctx = priv;
> > + struct mtk_jpegenc_comp_dev *comp_jpeg;
> > struct mtk_jpeg_dev *jpeg = ctx->jpeg;
> > - struct vb2_v4l2_buffer *src_buf, *dst_buf;
> > + unsigned long flags;
> > + int hw_id = -1;
> > + int i;
> > +
> > + spin_lock_irqsave(&jpeg->hw_lock, flags);
> > + for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) {
> > + comp_jpeg = jpeg->enc_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_jpegenc_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_jpegenc_comp_dev *jpeg = ctx->jpeg-
> > >enc_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 int mtk_jpegenc_deselect_hw(struct mtk_jpeg_dev *jpeg,
> > + int hw_id)
> > +{
> > + unsigned long flags;
> > +
> > + spin_lock_irqsave(&jpeg->hw_lock, flags);
> > + jpeg->enc_hw_dev[hw_id]->hw_state = MTK_JPEG_HW_IDLE;
> > + spin_unlock_irqrestore(&jpeg->hw_lock, flags);
> > +
> > + return 0;
> > +}
> > +
> > +static void mtk_jpegenc_worker(struct work_struct *work)
> > +{
> > + struct mtk_jpegenc_comp_dev *comp_jpeg[MTK_JPEGENC_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;
> > + atomic_t *hw_rdy[MTK_JPEGENC_HW_MAX];
> > + struct clk *jpegenc_clk;
> > + int ret, i, hw_id = 0;
> > unsigned long flags;
> > - int ret;
> >
> > + struct mtk_jpeg_ctx *ctx = container_of(work,
> > + struct mtk_jpeg_ctx,
> > + jpeg_work);
> > + struct mtk_jpeg_dev *jpeg = ctx->jpeg;
> > +
> > + for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) {
> > + comp_jpeg[i] = jpeg->enc_hw_dev[i];
> > + hw_rdy[i] = &comp_jpeg[i]->hw_rdy;
> > + }
> > +
> > +retry_select:
> > + hw_id = mtk_jpegenc_select_hw(ctx);
> > + if (hw_id < 0) {
> > + ret = wait_event_interruptible(jpeg->enc_hw_wq,
> > + (atomic_read(hw_rdy[0]) ||
> > + atomic_read(hw_rdy[1])) > 0);
> > + 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(&comp_jpeg[hw_id]->hw_rdy);
> > src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
> > + if (!src_buf) {
> > + dev_err(jpeg->dev, "%s : %d, get src_buf fail !!!\n",
> > + __func__, __LINE__);
> > + goto getbuf_fail;
> > + }
> > +
> > dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
> > + if (!dst_buf) {
> > + pr_info("%s : %d, get dst_buf fail !!!\n",
> > + __func__, __LINE__);
> > + goto getbuf_fail;
> > + }
> >
> > - ret = pm_runtime_resume_and_get(jpeg->dev);
> > - if (ret < 0)
> > - goto enc_end;
> > + jpeg_src_buf = mtk_jpeg_vb2_to_srcbuf(&src_buf->vb2_buf);
> > + jpeg_dst_buf = mtk_jpeg_vb2_to_srcbuf(&dst_buf->vb2_buf);
> > + 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++;
> >
> > - schedule_delayed_work(&jpeg->job_timeout_work,
> > - msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC
> > ));
> > + v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> > + v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
> > + mtk_jpegenc_set_hw_param(ctx, hw_id, src_buf, dst_buf);
> > + ret = pm_runtime_get_sync(comp_jpeg[hw_id]->pm.dev);
> > + if (ret < 0) {
> > + dev_err(jpeg->dev, "%s : %d, pm_runtime_get_sync fail
> > !!!\n",
> > + __func__, __LINE__);
> > + goto enc_end;
> > + }
> >
> > - spin_lock_irqsave(&jpeg->hw_lock, flags);
> > + jpegenc_clk = comp_jpeg[hw_id]->pm.venc_clk.clk_info-
> > >jpegenc_clk;
> > + ret = clk_prepare_enable(jpegenc_clk);
> > + if (ret) {
> > + dev_err(jpeg->dev, "%s : %d, jpegenc clk_prepare_enable
> > fail\n",
> > + __func__, __LINE__);
> > + goto enc_end;
> > + }
> >
> > - /*
> > - * Resetting the hardware every frame is to ensure that all the
> > - * registers are cleared. This is a hardware requirement.
> > - */
> > - mtk_jpeg_enc_reset(jpeg->reg_base);
> > + schedule_delayed_work(&comp_jpeg[hw_id]->job_timeout_work,
> > + msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC));
> > +
> > + spin_lock_irqsave(&comp_jpeg[hw_id]->hw_lock, flags);
> > + mtk_jpeg_enc_reset(comp_jpeg[hw_id]->reg_base);
> > + mtk_jpeg_set_enc_dst(ctx,
> > + comp_jpeg[hw_id]->reg_base,
> > + &dst_buf->vb2_buf);
> > + mtk_jpeg_set_enc_src(ctx,
> > + comp_jpeg[hw_id]->reg_base,
> > + &src_buf->vb2_buf);
> > + mtk_jpeg_set_enc_params(ctx, comp_jpeg[hw_id]->reg_base);
> > + mtk_jpeg_enc_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);
> >
> > - mtk_jpeg_set_enc_src(ctx, jpeg->reg_base, &src_buf->vb2_buf);
> > - mtk_jpeg_set_enc_dst(ctx, jpeg->reg_base, &dst_buf->vb2_buf);
> > - mtk_jpeg_set_enc_params(ctx, jpeg->reg_base);
> > - mtk_jpeg_enc_start(jpeg->reg_base);
> > - spin_unlock_irqrestore(&jpeg->hw_lock, flags);
> > return;
> >
> > enc_end:
> > @@ -947,9 +1060,20 @@ static void mtk_jpeg_enc_device_run(void
> > *priv)
> > 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(&comp_jpeg[hw_id]->hw_rdy);
> > + mtk_jpegenc_deselect_hw(jpeg, hw_id);
> > v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
> > }
> >
> > +static void mtk_jpeg_enc_device_run(void *priv)
> > +{
> > + struct mtk_jpeg_ctx *ctx = priv;
> > + struct mtk_jpeg_dev *jpeg = ctx->jpeg;
>
> You are reusing the jpeg_work structure, so if you call multiple
> times
> mtk_jpeg_enc_device_run(), before the old one is completed, you would
> overwrite the old values. Is this what you want?
queue_work only queue jpeg_work to workqueue, and the worker function
will schedule to encode.The encode source data is set in output buffer,
and it would not overwrite.
> > +
> > + queue_work(jpeg->workqueue, &ctx->jpeg_work);
> > +}
> > +
> > static void mtk_jpeg_dec_device_run(void *priv)
> > {
> > struct mtk_jpeg_ctx *ctx = priv;
> > @@ -1217,6 +1341,9 @@ static int mtk_jpeg_open(struct file *file)
> > goto free;
> > }
> >
> > + if (jpeg->variant->is_encoder)
> > + INIT_WORK(&ctx->jpeg_work, mtk_jpegenc_worker);
> > +
> > v4l2_fh_init(&ctx->fh, vfd);
> > file->private_data = &ctx->fh;
> > v4l2_fh_add(&ctx->fh);
> > @@ -1387,6 +1514,15 @@ static int mtk_jpeg_probe(struct
> > platform_device *pdev)
> > }
> >
> > pm_runtime_enable(&pdev->dev);
> > + } else {
> > + init_waitqueue_head(&jpeg->enc_hw_wq);
> > + jpeg->workqueue =
> > alloc_ordered_workqueue(MTK_JPEG_NAME,
> > + WQ_MEM_RECLAIM | WQ_FREEZABLE);
> > + if (!jpeg->workqueue) {
> > + dev_err(&pdev->dev, "Failed to create jpeg
> > workqueue!\n");
> > + ret = -EINVAL;
> > + goto err_alloc_workqueue;
> > + }
> > }
> >
> > ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);
> > @@ -1460,6 +1596,8 @@ static int mtk_jpeg_probe(struct
> > platform_device *pdev)
> >
> > err_clk_init:
> >
> > +err_alloc_workqueue:
> > +
> > err_req_irq:
> >
> > return ret;
> > @@ -1475,6 +1613,8 @@ static int mtk_jpeg_remove(struct
> > platform_device *pdev)
> > v4l2_m2m_release(jpeg->m2m_dev);
> > v4l2_device_unregister(&jpeg->v4l2_dev);
> > mtk_jpeg_clk_release(jpeg);
> > + flush_workqueue(jpeg->workqueue);
> > + destroy_workqueue(jpeg->workqueue);
> >
> > return 0;
> > }
> > diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
> > b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
> > index baab305..4c669af 100644
> > --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
> > +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
> > @@ -75,6 +75,11 @@ struct mtk_jpeg_variant {
> > u32 cap_q_default_fourcc;
> > };
> >
> > +enum mtk_jpeg_hw_state {
> > + MTK_JPEG_HW_IDLE = 0,
> > + MTK_JPEG_HW_BUSY = 1,
> > +};
> > +
> > struct mtk_jpeg_hw_param {
> > struct vb2_v4l2_buffer *src_buffer;
> > struct vb2_v4l2_buffer *dst_buffer;
> > @@ -130,6 +135,9 @@ struct mtk_jpegenc_comp_dev {
> > int jpegenc_irq;
> > struct delayed_work job_timeout_work;
> > struct mtk_jpeg_hw_param hw_param;
> > + atomic_t hw_rdy;
> > + enum mtk_jpeg_hw_state hw_state;
> > + spinlock_t hw_lock;
> > };
> >
> > /**
> > @@ -163,6 +171,7 @@ struct mtk_jpeg_dev {
> >
> > void __iomem *reg_encbase[MTK_JPEGENC_HW_MAX];
> > struct mtk_jpegenc_comp_dev *enc_hw_dev[MTK_JPEGENC_HW_MAX];
> > + wait_queue_head_t enc_hw_wq;
> > };
> >
> > /**
> > @@ -221,6 +230,8 @@ struct mtk_jpeg_ctx {
> > u8 enc_quality;
> > u8 restart_interval;
> > struct v4l2_ctrl_handler ctrl_hdl;
> > + struct work_struct jpeg_work;
> > + u32 total_frame_num;
> > };
> >
> > extern struct platform_driver mtk_jpegenc_hw_driver;
> > diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
> > b/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
> > index e62b875..244f9f7 100644
> > --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
> > +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
> > @@ -190,6 +190,7 @@ static void mtk_jpegenc_timeout_work(struct
> > work_struct *work)
> > struct mtk_jpegenc_comp_dev *cjpeg =
> > container_of(Pwork, struct mtk_jpegenc_comp_dev,
> > job_timeout_work);
> > + struct mtk_jpeg_dev *master_jpeg = cjpeg->master_dev;
> > enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
> > struct vb2_v4l2_buffer *src_buf;
> >
> > @@ -198,6 +199,9 @@ static void mtk_jpegenc_timeout_work(struct
> > work_struct *work)
> > mtk_jpeg_enc_reset(cjpeg->reg_base);
> > clk_disable_unprepare(cjpeg->pm.venc_clk.clk_info-
> > >jpegenc_clk);
> > pm_runtime_put(cjpeg->pm.dev);
> > + cjpeg->hw_state = MTK_JPEG_HW_IDLE;
> > + atomic_inc(&cjpeg->hw_rdy);
> > + wake_up(&master_jpeg->enc_hw_wq);
> > v4l2_m2m_buf_done(src_buf, buf_state);
> > }
> >
> > @@ -235,7 +239,17 @@ static irqreturn_t
> > mtk_jpegenc_hw_irq_handler(int irq, void *priv)
> > v4l2_m2m_buf_done(src_buf, buf_state);
> > v4l2_m2m_buf_done(dst_buf, buf_state);
> > v4l2_m2m_job_finish(master_jpeg->m2m_dev, ctx->fh.m2m_ctx);
> > + clk_disable_unprepare(jpeg->pm.venc_clk.clk_info->jpegenc_clk);
> > pm_runtime_put(ctx->jpeg->dev);
> > + if (ctx->fh.m2m_ctx &&
> > + (!list_empty(&ctx->fh.m2m_ctx->out_q_ctx.rdy_queue) ||
> > + !list_empty(&ctx->fh.m2m_ctx->cap_q_ctx.rdy_queue))) {
> > + queue_work(master_jpeg->workqueue, &ctx->jpeg_work);
> > + }
> > +
> > + jpeg->hw_state = MTK_JPEG_HW_IDLE;
> > + wake_up(&master_jpeg->enc_hw_wq);
> > + atomic_inc(&jpeg->hw_rdy);
> >
> > return IRQ_HANDLED;
> > }
> > @@ -341,6 +355,9 @@ static int mtk_jpegenc_hw_probe(struct
> > platform_device *pdev)
> > return -ENOMEM;
> >
> > dev->plat_dev = pdev;
> > + atomic_set(&dev->hw_rdy, 1U);
> > + spin_lock_init(&dev->hw_lock);
> > + dev->hw_state = MTK_JPEG_HW_IDLE;
> >
> > INIT_DELAYED_WORK(&dev->job_timeout_work,
> > mtk_jpegenc_timeout_work);
> > --
> > 2.6.4
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
More information about the Linux-mediatek
mailing list