mtk-jpegenc: add jpeg encode worker interface
authorkyrie wu <kyrie.wu@mediatek.com>
Thu, 29 Sep 2022 09:08:07 +0000 (17:08 +0800)
committerHans Verkuil <hverkuil-cisco@xs4all.nl>
Fri, 30 Sep 2022 14:39:28 +0000 (16:39 +0200)
Add jpeg encoding worker to ensure that two HWs
run in parallel in MT8195.

Signed-off-by: kyrie wu <kyrie.wu@mediatek.com>
Signed-off-by: irui wang <irui.wang@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c

index 8a82e02a117c7fa6596103495833fdf1600724b6..930384531259923fc5a3914a957f493d7c2f332d 100644 (file)
@@ -104,11 +104,20 @@ static struct mtk_jpeg_fmt mtk_jpeg_dec_formats[] = {
 
 #define MTK_JPEG_ENC_NUM_FORMATS ARRAY_SIZE(mtk_jpeg_enc_formats)
 #define MTK_JPEG_DEC_NUM_FORMATS ARRAY_SIZE(mtk_jpeg_dec_formats)
+#define MTK_JPEG_MAX_RETRY_TIME 5000
+
+enum {
+       MTK_JPEG_BUF_FLAGS_INIT                 = 0,
+       MTK_JPEG_BUF_FLAGS_LAST_FRAME           = 1,
+};
 
 struct mtk_jpeg_src_buf {
+       u32 frame_num;
        struct vb2_v4l2_buffer b;
        struct list_head list;
        struct mtk_jpeg_dec_param dec_param;
+
+       struct mtk_jpeg_ctx *curr_ctx;
 };
 
 static int debug;
@@ -905,6 +914,148 @@ static int mtk_jpeg_set_dec_dst(struct mtk_jpeg_ctx *ctx,
        return 0;
 }
 
+static int mtk_jpegenc_get_hw(struct mtk_jpeg_ctx *ctx)
+{
+       struct mtk_jpegenc_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_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_put_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_dst_buf;
+       struct vb2_v4l2_buffer *src_buf, *dst_buf;
+       int ret, i, hw_id = 0;
+       unsigned long flags;
+
+       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];
+       i = 0;
+
+retry_select:
+       hw_id = mtk_jpegenc_get_hw(ctx);
+       if (hw_id < 0) {
+               ret = wait_event_interruptible(jpeg->enc_hw_wq,
+                                              atomic_read(&jpeg->enchw_rdy) > 0);
+               if (ret != 0 || (i++ > MTK_JPEG_MAX_RETRY_TIME)) {
+                       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->enchw_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);
+
+       mtk_jpegenc_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 enc_end;
+       }
+
+       ret = clk_prepare_enable(comp_jpeg[hw_id]->venc_clk.clks->clk);
+       if (ret) {
+               dev_err(jpeg->dev, "%s : %d, jpegenc clk_prepare_enable fail\n",
+                       __func__, __LINE__);
+               goto enc_end;
+       }
+
+       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);
+       jpeg_dst_buf = mtk_jpeg_vb2_to_srcbuf(&dst_buf->vb2_buf);
+       jpeg_dst_buf->curr_ctx = ctx;
+       jpeg_dst_buf->frame_num = ctx->total_frame_num;
+       ctx->total_frame_num++;
+       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);
+
+       return;
+
+enc_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->enchw_rdy);
+       mtk_jpegenc_put_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;
@@ -922,7 +1073,7 @@ static void mtk_jpeg_enc_device_run(void *priv)
                goto enc_end;
 
        schedule_delayed_work(&jpeg->job_timeout_work,
-                             msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC));
+                       msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC));
 
        spin_lock_irqsave(&jpeg->hw_lock, flags);
 
@@ -947,6 +1098,14 @@ enc_end:
        v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
 }
 
+static void mtk_jpeg_multicore_enc_device_run(void *priv)
+{
+       struct mtk_jpeg_ctx *ctx = priv;
+       struct mtk_jpeg_dev *jpeg = ctx->jpeg;
+
+       queue_work(jpeg->workqueue, &ctx->jpeg_work);
+}
+
 static void mtk_jpeg_dec_device_run(void *priv)
 {
        struct mtk_jpeg_ctx *ctx = priv;
@@ -1009,6 +1168,10 @@ static const struct v4l2_m2m_ops mtk_jpeg_enc_m2m_ops = {
        .device_run = mtk_jpeg_enc_device_run,
 };
 
+static const struct v4l2_m2m_ops mtk_jpeg_multicore_enc_m2m_ops = {
+       .device_run = mtk_jpeg_multicore_enc_device_run,
+};
+
 static const struct v4l2_m2m_ops mtk_jpeg_dec_m2m_ops = {
        .device_run = mtk_jpeg_dec_device_run,
        .job_ready  = mtk_jpeg_dec_job_ready,
@@ -1209,6 +1372,9 @@ static int mtk_jpeg_open(struct file *file)
                goto free;
        }
 
+       if (jpeg->is_jpgenc_multihw)
+               INIT_WORK(&ctx->jpeg_work, mtk_jpegenc_worker);
+
        v4l2_fh_init(&ctx->fh, vfd);
        file->private_data = &ctx->fh;
        v4l2_fh_add(&ctx->fh);
@@ -1501,6 +1667,17 @@ static const struct mtk_jpeg_variant mtk_jpeg_drvdata = {
        .cap_q_default_fourcc = V4L2_PIX_FMT_JPEG,
 };
 
+static struct mtk_jpeg_variant mtk8195_jpegenc_drvdata = {
+       .formats = mtk_jpeg_enc_formats,
+       .num_formats = MTK_JPEG_ENC_NUM_FORMATS,
+       .qops = &mtk_jpeg_enc_qops,
+       .m2m_ops = &mtk_jpeg_multicore_enc_m2m_ops,
+       .dev_name = "mtk-jpeg-enc",
+       .ioctl_ops = &mtk_jpeg_enc_ioctl_ops,
+       .out_q_default_fourcc = V4L2_PIX_FMT_YUYV,
+       .cap_q_default_fourcc = V4L2_PIX_FMT_JPEG,
+};
+
 #if defined(CONFIG_OF)
 static const struct of_device_id mtk_jpeg_match[] = {
        {
@@ -1515,6 +1692,10 @@ static const struct of_device_id mtk_jpeg_match[] = {
                .compatible = "mediatek,mtk-jpgenc",
                .data = &mtk_jpeg_drvdata,
        },
+       {
+               .compatible = "mediatek,mt8195-jpgenc",
+               .data = &mtk8195_jpegenc_drvdata,
+       },
        {},
 };
 
index 98de83c9ea4cf59ce744f017dcf8e92a1df51bb4..cbc6fbc216818fc7d7a3c4b820d370adf687f2e0 100644 (file)
@@ -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;
@@ -107,6 +112,9 @@ struct mtk_jpegenc_clk {
  * @jpegenc_irq:       jpeg encode irq num
  * @job_timeout_work:  encode timeout workqueue
  * @hw_param:          jpeg encode hw parameters
+ * @hw_rdy:            record hw ready
+ * @hw_state:          record hw state
+ * @hw_lock:           spinlock protecting the hw device resource
  */
 struct mtk_jpegenc_comp_dev {
        struct device *dev;
@@ -117,6 +125,9 @@ struct mtk_jpegenc_comp_dev {
        int jpegenc_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 */
+       spinlock_t hw_lock;
 };
 
 /**
@@ -135,6 +146,8 @@ struct mtk_jpegenc_comp_dev {
  * @reg_encbase:       jpg encode register base addr
  * @enc_hw_dev:                jpg encode hardware device
  * @is_jpgenc_multihw: the flag of multi-hw core
+ * @enc_hw_wq:         jpg encode wait queue
+ * @enchw_rdy:         jpg encode hw ready flag
  */
 struct mtk_jpeg_dev {
        struct mutex            lock;
@@ -152,6 +165,8 @@ struct mtk_jpeg_dev {
        void __iomem *reg_encbase[MTK_JPEGENC_HW_MAX];
        struct mtk_jpegenc_comp_dev *enc_hw_dev[MTK_JPEGENC_HW_MAX];
        bool is_jpgenc_multihw;
+       wait_queue_head_t enc_hw_wq;
+       atomic_t enchw_rdy;
 };
 
 /**
@@ -199,6 +214,8 @@ struct mtk_jpeg_q_data {
  * @enc_quality:       jpeg encoder quality
  * @restart_interval:  jpeg encoder restart interval
  * @ctrl_hdl:          controls handler
+ * @jpeg_work:         jpeg encoder workqueue
+ * @total_frame_num:   encoded frame number
  */
 struct mtk_jpeg_ctx {
        struct mtk_jpeg_dev             *jpeg;
@@ -210,6 +227,9 @@ 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;
 };
 
 #endif /* _MTK_JPEG_CORE_H */
index 95812f60ab9fb59bb25601f40ff2c04f565fb201..02d6c49936530b33654c6a33e2620e2f8a4c04da 100644 (file)
@@ -192,6 +192,7 @@ static void mtk_jpegenc_timeout_work(struct work_struct *work)
                container_of(dly_work,
                             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, *dst_buf;
 
@@ -202,6 +203,9 @@ static void mtk_jpegenc_timeout_work(struct work_struct *work)
        mtk_jpeg_enc_reset(cjpeg->reg_base);
        clk_disable_unprepare(cjpeg->venc_clk.clks->clk);
        pm_runtime_put(cjpeg->dev);
+       cjpeg->hw_state = MTK_JPEG_HW_IDLE;
+       atomic_inc(&master_jpeg->enchw_rdy);
+       wake_up(&master_jpeg->enc_hw_wq);
        v4l2_m2m_buf_done(src_buf, buf_state);
 }
 
@@ -218,30 +222,33 @@ static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
 
        cancel_delayed_work(&jpeg->job_timeout_work);
 
+       ctx = jpeg->hw_param.curr_ctx;
+       src_buf = jpeg->hw_param.src_buffer;
+       dst_buf = jpeg->hw_param.dst_buffer;
+       v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
+
        irq_status = readl(jpeg->reg_base + JPEG_ENC_INT_STS) &
                JPEG_ENC_INT_STATUS_MASK_ALLIRQ;
        if (irq_status)
                writel(0, jpeg->reg_base + JPEG_ENC_INT_STS);
        if (!(irq_status & JPEG_ENC_INT_STATUS_DONE))
-               return IRQ_NONE;
-
-       ctx = v4l2_m2m_get_curr_priv(master_jpeg->m2m_dev);
-       if (!ctx) {
-               v4l2_err(&master_jpeg->v4l2_dev, "Context is NULL\n");
-               return IRQ_HANDLED;
-       }
-
-       src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
-       dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-       v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
+               dev_warn(jpeg->dev, "Jpg Enc occurs unknown Err.");
 
        result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base);
        vb2_set_plane_payload(&dst_buf->vb2_buf, 0, result_size);
        buf_state = VB2_BUF_STATE_DONE;
        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);
        pm_runtime_put(ctx->jpeg->dev);
+       clk_disable_unprepare(jpeg->venc_clk.clks->clk);
+       if (!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(&master_jpeg->enchw_rdy);
 
        return IRQ_HANDLED;
 }
@@ -296,8 +303,19 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
                master_dev->is_jpgenc_multihw = true;
                for (i = 0; i < MTK_JPEGENC_HW_MAX; i++)
                        master_dev->enc_hw_dev[i] = NULL;
+
+               init_waitqueue_head(&master_dev->enc_hw_wq);
+               master_dev->workqueue = alloc_ordered_workqueue(MTK_JPEG_NAME,
+                                                               WQ_MEM_RECLAIM
+                                                               | WQ_FREEZABLE);
+               if (!master_dev->workqueue)
+                       return -EINVAL;
        }
 
+       atomic_set(&master_dev->enchw_rdy, MTK_JPEGENC_HW_MAX);
+       spin_lock_init(&dev->hw_lock);
+       dev->hw_state = MTK_JPEG_HW_IDLE;
+
        INIT_DELAYED_WORK(&dev->job_timeout_work,
                          mtk_jpegenc_timeout_work);