kyrie.wu wrote:
> add output reorder func to reorder the output images
> to ensure the output pic is consistent with the input images.
>
> Signed-off-by: kyrie.wu <kyrie.wu@xxxxxxxxxxxx>
> ---
> drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 50 +++++++++++++++++++++--
> 1 file changed, 46 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c
> index 9138ecb..fad5bf1c 100644
> --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c
> +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c
> @@ -443,6 +443,49 @@ void mtk_jpeg_dec_set_config(void __iomem *base,
> mtk_jpeg_dec_set_pause_mcu_idx(base, config->total_mcu);
> }
>
> +void mtk_jpegdec_put_buf(struct mtk_jpegdec_comp_dev *jpeg)
> +{
> + struct mtk_jpeg_src_buf *dst_done_buf, *tmp_dst_done_buf;
> + struct vb2_v4l2_buffer *dst_buffer;
> + struct list_head *temp_entry;
> + struct list_head *pos = NULL;
> + struct mtk_jpeg_ctx *ctx;
> + unsigned long flags;
> +
> + ctx = jpeg->hw_param.curr_ctx;
> + if (!ctx) {
> + dev_err(jpeg->dev, "comp_jpeg ctx fail !!!\n");
> + return;
> + }
> +
> + dst_buffer = jpeg->hw_param.dst_buffer;
> + if (!dst_buffer) {
> + dev_err(jpeg->dev, "comp_jpeg dst_buffer fail !!!\n");
> + return;
> + }
> +
> + dst_done_buf = container_of(dst_buffer, struct mtk_jpeg_src_buf, b);
> +
> + spin_lock_irqsave(&ctx->done_queue_lock, flags);
> + list_add_tail(&dst_done_buf->list, &ctx->dst_done_queue);
> + while (!list_empty(&ctx->dst_done_queue) &&
> + (pos != &ctx->dst_done_queue)) {
> + list_for_each_prev_safe(pos, temp_entry,
> + (&ctx->dst_done_queue)) {
> + tmp_dst_done_buf = list_entry(pos,
> + struct mtk_jpeg_src_buf, list);
> + if (tmp_dst_done_buf->frame_num ==
> + ctx->last_done_frame_num) {
> + list_del(&tmp_dst_done_buf->list);
> + v4l2_m2m_buf_done(&tmp_dst_done_buf->b,
> + VB2_BUF_STATE_DONE);
> + ctx->last_done_frame_num++;
> + }
> + }
> + }
> + spin_unlock_irqrestore(&ctx->done_queue_lock, flags);
> +}
> +
> static void mtk_jpegdec_timeout_work(struct work_struct *work)
> {
> enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
> @@ -450,10 +493,9 @@ static void mtk_jpegdec_timeout_work(struct work_struct *work)
> container_of(work, struct mtk_jpegdec_comp_dev,
> job_timeout_work.work);
> struct mtk_jpeg_dev *master_jpeg = cjpeg->master_dev;
> - struct vb2_v4l2_buffer *src_buf, *dst_buf;
> + struct vb2_v4l2_buffer *src_buf;
>
> src_buf = cjpeg->hw_param.src_buffer;
> - dst_buf = cjpeg->hw_param.dst_buffer;
>
> mtk_jpeg_dec_reset(cjpeg->reg_base);
> clk_disable_unprepare(cjpeg->pm.dec_clk.clk_info->jpegdec_clk);
> @@ -462,7 +504,7 @@ static void mtk_jpegdec_timeout_work(struct work_struct *work)
> atomic_inc(&cjpeg->hw_rdy);
> wake_up(&master_jpeg->dec_hw_wq);
> v4l2_m2m_buf_done(src_buf, buf_state);
> - v4l2_m2m_buf_done(dst_buf, buf_state);
> + mtk_jpegdec_put_buf(cjpeg);
> }
>
> int mtk_jpegdec_init_pm(struct mtk_jpegdec_comp_dev *mtkdev)
> @@ -559,7 +601,7 @@ static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)
>
> dec_end:
> v4l2_m2m_buf_done(src_buf, buf_state);
> - v4l2_m2m_buf_done(dst_buf, buf_state);
> + mtk_jpegdec_put_buf(jpeg);
> v4l2_m2m_job_finish(master_jpeg->m2m_dev, ctx->fh.m2m_ctx);
> clk_disable_unprepare(jpeg->pm.dec_clk.clk_info->jpegdec_clk);
> pm_runtime_put(ctx->jpeg->dev);
> --
> 2.6.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
