[PATCH v2, 5/9] media: mtk-jpegenc: Generalize jpeg encode irq interfaces
kyrie.wu
kyrie.wu at mediatek.com
Wed Jun 30 00:27:55 PDT 2021
Generalizes jpeg encode irq interfaces to support different hardware.
Signed-off-by: kyrie.wu <kyrie.wu at mediatek.com>
---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 124 +++++++++++++++++++++++-
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 24 ++++-
2 files changed, 146 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index 7c053e3..062feab 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -106,10 +106,40 @@ 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)
+/*
+ * mtk_jpeg_enc_param: General jpeg encoding parameters
+ * @enc_w: image width
+ * @enc_h: image height
+ * @enable_exif: EXIF enable for jpeg encode mode
+ * @enc_quality: destination image quality in encode mode
+ * @enc_format: input image format
+ * @restart_interval: JPEG restart interval for JPEG encoding
+ * @img_stride: jpeg encoder image stride
+ * @mem_stride: jpeg encoder memory stride
+ * @total_encdu: total 8x8 block number
+ */
+struct mtk_jpeg_enc_param {
+ u32 enc_w;
+ u32 enc_h;
+ u32 enable_exif;
+ u32 enc_quality;
+ u32 enc_format;
+ u32 restart_interval;
+ u32 img_stride;
+ u32 mem_stride;
+ u32 total_encdu;
+};
+
struct mtk_jpeg_src_buf {
struct vb2_v4l2_buffer b;
struct list_head list;
+ u32 frame_num;
+ u32 bs_size;
+ int flags;
struct mtk_jpeg_dec_param dec_param;
+
+ struct mtk_jpeg_enc_param enc_param;
+ struct mtk_jpeg_ctx *curr_ctx;
};
static int debug;
@@ -1163,6 +1193,98 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv)
return IRQ_HANDLED;
}
+void mtk_jpeg_put_buf(struct mtk_jpeg_dev *jpeg)
+{
+ struct mtk_jpeg_ctx *ctx;
+ struct vb2_v4l2_buffer *dst_buffer;
+ struct list_head *temp_entry;
+ struct list_head *pos;
+ struct mtk_jpeg_src_buf *dst_done_buf, *tmp_dst_done_buf;
+ 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 = mtk_jpeg_vb2_to_srcbuf(&dst_buffer->vb2_buf);
+
+ 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);
+}
+
+irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
+{
+ struct mtk_jpeg_dev *jpeg = priv;
+ struct mtk_jpeg_ctx *ctx;
+ struct mtk_jpeg_dev *master_jpeg;
+ struct vb2_v4l2_buffer *src_buf, *dst_buf;
+
+ enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
+ u32 result_size;
+ u32 irq_status;
+
+ cancel_delayed_work(&jpeg->job_timeout_work);
+
+ src_buf = jpeg->hw_param.src_buffer;
+ dst_buf = jpeg->hw_param.dst_buffer;
+ ctx = jpeg->hw_param.curr_ctx;
+ master_jpeg = ctx->jpeg;
+ irq_status = readl(jpeg->reg_base[MTK_JPEGENC_HW0] + JPEG_ENC_INT_STS) &
+ JPEG_ENC_INT_STATUS_MASK_ALLIRQ;
+ if (irq_status)
+ writel(0, jpeg->reg_base[MTK_JPEGENC_HW0] + JPEG_ENC_INT_STS);
+ if (!(irq_status & JPEG_ENC_INT_STATUS_DONE)) {
+ dev_err(jpeg->dev, "jpeg encode failed !!!\n");
+ goto irq_end;
+ }
+
+ result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base[0]);
+ vb2_set_plane_payload(&dst_buf->vb2_buf, 0, result_size);
+
+ buf_state = VB2_BUF_STATE_DONE;
+
+irq_end:
+ v4l2_m2m_buf_done(src_buf, buf_state);
+ mtk_jpeg_put_buf(jpeg);
+ pm_runtime_put(jpeg->pm.dev);
+ clk_disable_unprepare(jpeg->pm.venc_clk.clk_info->jpegenc_clk);
+ 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->hw_wq);
+ atomic_inc(&jpeg->hw_rdy);
+ return IRQ_HANDLED;
+}
+
static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx)
{
struct mtk_jpeg_q_data *q = &ctx->out_q;
@@ -1352,7 +1474,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- jpeg->reg_base = devm_ioremap_resource(&pdev->dev, res);
+ jpeg->reg_base[0] = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(jpeg->reg_base)) {
ret = PTR_ERR(jpeg->reg_base);
return ret;
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
index 93ea71c..03ff060 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
@@ -75,6 +75,17 @@ struct mtk_jpeg_variant {
u32 cap_q_default_fourcc;
};
+struct mtk_jpeg_hw_param {
+ struct vb2_v4l2_buffer *src_buffer;
+ struct vb2_v4l2_buffer *dst_buffer;
+ struct mtk_jpeg_ctx *curr_ctx;
+};
+
+enum mtk_jpeg_hw_state {
+ MTK_JPEG_HW_IDLE = 0,
+ MTK_JPEG_HW_BUSY = 1,
+};
+
enum mtk_jpegenc_hw_id {
MTK_JPEGENC_HW0,
MTK_JPEGENC_HW1,
@@ -124,13 +135,18 @@ struct mtk_jpeg_dev {
struct v4l2_m2m_dev *m2m_dev;
void *alloc_ctx;
struct video_device *vdev;
- void __iomem *reg_base;
struct device *larb;
struct delayed_work job_timeout_work;
const struct mtk_jpeg_variant *variant;
+ void __iomem *reg_base[MTK_JPEGENC_HW_MAX];
+ int jpegenc_irq;
struct mtk_jpeg_dev *hw_dev[MTK_JPEGENC_HW_MAX];
struct mtk_jpegenc_pm pm;
+ enum mtk_jpeg_hw_state hw_state;
+ struct mtk_jpeg_hw_param hw_param;
+ wait_queue_head_t hw_wq;
+ atomic_t hw_rdy;
};
/**
@@ -189,6 +205,12 @@ struct mtk_jpeg_ctx {
u8 enc_quality;
u8 restart_interval;
struct v4l2_ctrl_handler ctrl_hdl;
+
+ struct list_head dst_done_queue;
+ spinlock_t done_queue_lock; /* spinlock protecting done queue */
+ u32 total_frame_num;
+ u32 last_done_frame_num;
+ struct work_struct jpeg_work;
};
#endif /* _MTK_JPEG_CORE_H */
--
2.6.4
More information about the linux-arm-kernel
mailing list