media: mtk-vcodec: Add irq interface for multi hardware

Adds irq interface for multi hardware.

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
index 7e2c9c381dd288777d4d8580c7da78f6078d20d4..40d1f16a0a250911fbe5c3991f6e5832969bbdc5 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@ -24,6 +24,19 @@
 #include "mtk_vcodec_util.h"
 #include "mtk_vcodec_fw.h"
 
+static int mtk_vcodec_get_hw_count(struct mtk_vcodec_dev *dev)
+{
+       switch (dev->vdec_pdata->hw_arch) {
+       case MTK_VDEC_PURE_SINGLE_CORE:
+               return MTK_VDEC_ONE_CORE;
+       case MTK_VDEC_LAT_SINGLE_CORE:
+               return MTK_VDEC_ONE_LAT_ONE_CORE;
+       default:
+               mtk_v4l2_err("hw arch %d not supported", dev->vdec_pdata->hw_arch);
+               return MTK_VDEC_NO_HW;
+       }
+}
+
 static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv)
 {
        struct mtk_vcodec_dev *dev = priv;
@@ -55,7 +68,7 @@ static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv)
        writel((readl(vdec_misc_addr) & ~VDEC_IRQ_CLR),
                dev->reg_base[VDEC_MISC] + VDEC_IRQ_CFG_REG);
 
-       wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED);
+       wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED, 0);
 
        mtk_v4l2_debug(3,
                        "mtk_vcodec_dec_irq_handler :wake up ctx %d, dec_done_status=%x",
@@ -128,7 +141,7 @@ static int fops_vcodec_open(struct file *file)
 {
        struct mtk_vcodec_dev *dev = video_drvdata(file);
        struct mtk_vcodec_ctx *ctx = NULL;
-       int ret = 0;
+       int ret = 0, i, hw_count;
        struct vb2_queue *src_vq;
 
        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
@@ -142,14 +155,24 @@ static int fops_vcodec_open(struct file *file)
        v4l2_fh_add(&ctx->fh);
        INIT_LIST_HEAD(&ctx->list);
        ctx->dev = dev;
-       init_waitqueue_head(&ctx->queue);
-       mutex_init(&ctx->lock);
+       if (ctx->dev->vdec_pdata->is_subdev_supported) {
+               hw_count = mtk_vcodec_get_hw_count(dev);
+               if (!hw_count || !dev->subdev_prob_done) {
+                       ret = -EINVAL;
+                       goto err_ctrls_setup;
+               }
 
-       if (dev->vdec_pdata->is_subdev_supported && dev->subdev_prob_done) {
                ret = dev->subdev_prob_done(dev);
                if (ret)
                        goto err_ctrls_setup;
+
+               for (i = 0; i < hw_count; i++)
+                       init_waitqueue_head(&ctx->queue[i]);
+       } else {
+               init_waitqueue_head(&ctx->queue[0]);
        }
+       mutex_init(&ctx->lock);
+
        ctx->type = MTK_INST_DECODER;
        ret = dev->vdec_pdata->ctrls_setup(ctx);
        if (ret) {

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
index cde9442e7ce63829aab0e4bb7ac5fde228104ef9..6b248dd94dd3969a7a99179782f26eaae38a913c 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
@@ -84,7 +84,7 @@ static irqreturn_t mtk_vdec_hw_irq_handler(int irq, void *priv)
        writel(dec_done_status | VDEC_IRQ_CFG, vdec_misc_addr);
        writel(dec_done_status & ~VDEC_IRQ_CLR, vdec_misc_addr);
 
-       wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED);
+       wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED, dev->hw_idx);
 
        mtk_v4l2_debug(3, "wake up ctx %d, dec_done_status=%x",
                       ctx->id, dec_done_status);

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index 17e7deee10b5578213e24fe1a65ec340a2b06b20..9667310cb55a1fd765cb789de6002b72f79ef94d 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@ -104,6 +104,16 @@ enum mtk_vdec_hw_id {
        MTK_VDEC_HW_MAX,
 };
 
+/*
+ * enum mtk_vdec_hw_count - Supported hardware count
+ */
+enum mtk_vdec_hw_count {
+       MTK_VDEC_NO_HW = 0,
+       MTK_VDEC_ONE_CORE,
+       MTK_VDEC_ONE_LAT_ONE_CORE,
+       MTK_VDEC_MAX_HW_COUNT,
+};
+
 /*
  * struct mtk_video_fmt - Structure used to store information about pixelformats
  */
@@ -293,9 +303,9 @@ struct mtk_vcodec_ctx {
        struct vdec_pic_info picinfo;
        int dpb_size;
 
-       int int_cond;
-       int int_type;
-       wait_queue_head_t queue;
+       int int_cond[MTK_VDEC_HW_MAX];
+       int int_type[MTK_VDEC_HW_MAX];
+       wait_queue_head_t queue[MTK_VDEC_HW_MAX];
        unsigned int irq_status;
 
        struct v4l2_ctrl_handler ctrl_hdl;
@@ -504,11 +514,12 @@ static inline struct mtk_vcodec_ctx *ctrl_to_ctx(struct v4l2_ctrl *ctrl)
 }
 
 /* Wake up context wait_queue */
-static inline void wake_up_ctx(struct mtk_vcodec_ctx *ctx, unsigned int reason)
+static inline void
+wake_up_ctx(struct mtk_vcodec_ctx *ctx, unsigned int reason, unsigned int hw_id)
 {
-       ctx->int_cond = 1;
-       ctx->int_type = reason;
-       wake_up_interruptible(&ctx->queue);
+       ctx->int_cond[hw_id] = 1;
+       ctx->int_type[hw_id] = reason;
+       wake_up_interruptible(&ctx->queue[hw_id]);
 }
 
 #endif /* _MTK_VCODEC_DRV_H_ */

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
index 027546108f4409a041014ea91771320c3c2f9d9c..347f0d87e2ff5ee1fc437aff817ded469b0fe281 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
@@ -103,7 +103,7 @@ static irqreturn_t mtk_vcodec_enc_irq_handler(int irq, void *priv)
 
        clean_irq_status(ctx->irq_status, addr);
 
-       wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED);
+       wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED, 0);
        return IRQ_HANDLED;
 }
 
@@ -129,7 +129,7 @@ static int fops_vcodec_open(struct file *file)
        v4l2_fh_add(&ctx->fh);
        INIT_LIST_HEAD(&ctx->list);
        ctx->dev = dev;
-       init_waitqueue_head(&ctx->queue);
+       init_waitqueue_head(&ctx->queue[0]);
 
        ctx->type = MTK_INST_ENCODER;
        ret = mtk_vcodec_enc_ctrls_setup(ctx);

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
index 70580c2525bacd7787c19eca5011d6d0710099bd..552b4c93d972768bd7a6fdc50a92c2325716adaa 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
@@ -11,34 +11,32 @@
 #include "mtk_vcodec_intr.h"
 #include "mtk_vcodec_util.h"
 
-int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx  *ctx, int command,
-                                unsigned int timeout_ms)
+int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx *ctx,
+                                int command, unsigned int timeout_ms,
+                                unsigned int hw_id)
 {
-       wait_queue_head_t *waitqueue;
        long timeout_jiff, ret;
        int status = 0;
 
-       waitqueue = (wait_queue_head_t *)&ctx->queue;
        timeout_jiff = msecs_to_jiffies(timeout_ms);
-
-       ret = wait_event_interruptible_timeout(*waitqueue,
-                               ctx->int_cond,
-                               timeout_jiff);
+       ret = wait_event_interruptible_timeout(ctx->queue[hw_id],
+                                              ctx->int_cond[hw_id],
+                                              timeout_jiff);
 
        if (!ret) {
                status = -1;    /* timeout */
-               mtk_v4l2_err("[%d] ctx->type=%d, cmd=%d, wait_event_interruptible_timeout time=%ums out %d %d!",
-                            ctx->id, ctx->type, command, timeout_ms,
-                            ctx->int_cond, ctx->int_type);
+               mtk_v4l2_err("[%d] cmd=%d, type=%d, dec timeout=%ums (%d %d)",
+                            ctx->id, command, ctx->type, timeout_ms,
+                            ctx->int_cond[hw_id], ctx->int_type[hw_id]);
        } else if (-ERESTARTSYS == ret) {
-               mtk_v4l2_err("[%d] ctx->type=%d, cmd=%d, wait_event_interruptible_timeout interrupted by a signal %d %d",
-                            ctx->id, ctx->type, command, ctx->int_cond,
-                            ctx->int_type);
                status = -1;
+               mtk_v4l2_err("[%d] cmd=%d, type=%d, dec inter fail (%d %d)",
+                            ctx->id, command, ctx->type,
+                            ctx->int_cond[hw_id], ctx->int_type[hw_id]);
        }
 
-       ctx->int_cond = 0;
-       ctx->int_type = 0;
+       ctx->int_cond[hw_id] = 0;
+       ctx->int_type[hw_id] = 0;
 
        return status;
 }

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
index 638cd1f3526af6b5754e82759375dfc486b94584..9681f492813b0c867f2de5930793e53d6c480df5 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
@@ -12,7 +12,8 @@
 struct mtk_vcodec_ctx;
 
 /* timeout is ms */
-int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx *data, int command,
-                               unsigned int timeout_ms);
+int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx *ctx,
+                                int command, unsigned int timeout_ms,
+                                unsigned int hw_id);
 
 #endif /* _MTK_VCODEC_INTR_H_ */

diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
index 40d6e6c5ac7aa82252e65b566376f8fb9ce2ccad..481655bb60164c5ae3bb0e381ed185d0d0781ece 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
@@ -413,7 +413,7 @@ static int vdec_h264_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
                /* wait decoder done interrupt */
                err = mtk_vcodec_wait_for_done_ctx(inst->ctx,
                                                   MTK_INST_IRQ_RECEIVED,
-                                                  WAIT_INTR_TIMEOUT_MS);
+                                                  WAIT_INTR_TIMEOUT_MS, 0);
                if (err)
                        goto err_free_fb_out;
 

diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
index fada4d1467030e3731d598b7177f28ca9da12dd7..43542de11e9c4e0d91b5003bdbb4df2c84e13e4e 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
@@ -727,7 +727,7 @@ static int vdec_h264_slice_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
        /* wait decoder done interrupt */
        err = mtk_vcodec_wait_for_done_ctx(inst->ctx,
                                           MTK_INST_IRQ_RECEIVED,
-                                          WAIT_INTR_TIMEOUT_MS);
+                                          WAIT_INTR_TIMEOUT_MS, 0);
        if (err)
                goto err_free_fb_out;
        vpu_dec_end(vpu);

diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
index e5393f8410806483141959d6999a19880a20cddf..88c046731754c51965849bb730e02672cbb6cae6 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
@@ -488,7 +488,7 @@ static int vdec_vp8_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
 
        /* wait decoder done interrupt */
        mtk_vcodec_wait_for_done_ctx(inst->ctx, MTK_INST_IRQ_RECEIVED,
-                                    WAIT_INTR_TIMEOUT_MS);
+                                    WAIT_INTR_TIMEOUT_MS, 0);
 
        if (inst->vsi->load_data)
                load_dec_table(inst);

diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
index 71cdc3ddafcbbd5383410ed6cd26de39f0d75052..70b8383f7c8ec3aa45697cde0562717387f92181 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
@@ -539,7 +539,7 @@ static bool vp9_wait_dec_end(struct vdec_vp9_inst *inst)
 
        mtk_vcodec_wait_for_done_ctx(inst->ctx,
                        MTK_INST_IRQ_RECEIVED,
-                       WAIT_INTR_TIMEOUT_MS);
+                       WAIT_INTR_TIMEOUT_MS, 0);
 
        if (ctx->irq_status & MTK_VDEC_IRQ_STATUS_DEC_SUCCESS)
                return true;

diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
index bf03888a824fc28386954d7dd7e6fa8fb9e8db2e..4d9b8798dffe18330b96f58455eae31157d2c45c 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
@@ -335,7 +335,7 @@ static unsigned int h264_enc_wait_venc_done(struct venc_h264_inst *inst)
        struct mtk_vcodec_ctx *ctx = (struct mtk_vcodec_ctx *)inst->ctx;
 
        if (!mtk_vcodec_wait_for_done_ctx(ctx, MTK_INST_IRQ_RECEIVED,
-                                         WAIT_INTR_TIMEOUT_MS)) {
+                                         WAIT_INTR_TIMEOUT_MS, 0)) {
                irq_status = ctx->irq_status;
                mtk_vcodec_debug(inst, "irq_status %x <-", irq_status);
        }

diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
index 6b66957d51928e043b07a0bcad958dc19cc97260..56ce58f761f15eefac1f1f4daa1819cb83a359ce 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
@@ -222,7 +222,7 @@ static unsigned int vp8_enc_wait_venc_done(struct venc_vp8_inst *inst)
        struct mtk_vcodec_ctx *ctx = (struct mtk_vcodec_ctx *)inst->ctx;
 
        if (!mtk_vcodec_wait_for_done_ctx(ctx, MTK_INST_IRQ_RECEIVED,
-                                         WAIT_INTR_TIMEOUT_MS)) {
+                                         WAIT_INTR_TIMEOUT_MS, 0)) {
                irq_status = ctx->irq_status;
                mtk_vcodec_debug(inst, "isr return %x", irq_status);
        }