[PATCH v2, 06/14] media: mtk-vcodec: Add irq interface for core hardware
Dafna Hirschfeld
dafna.hirschfeld at collabora.com
Mon Jul 19 02:25:33 PDT 2021
On 17.07.21 10:12, Yunfei Dong wrote:
> Adds irq interface for core hardware.
>
> Signed-off-by: Yunfei Dong <yunfei.dong at mediatek.com>
> ---
> v2: Using enum mtk_vdec_hw_count instead of magic numbers
> ---
> .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 31 ++++++++++++++++--
> .../platform/mtk-vcodec/mtk_vcodec_dec_hw.c | 11 ++++---
> .../platform/mtk-vcodec/mtk_vcodec_drv.h | 19 +++++++++++
> .../platform/mtk-vcodec/mtk_vcodec_intr.c | 32 ++++++++++++++++++-
> .../platform/mtk-vcodec/mtk_vcodec_intr.h | 4 ++-
> 5 files changed, 88 insertions(+), 9 deletions(-)
>
> 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 e7f60e948fe8..d1c4124f6092 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> @@ -75,6 +75,20 @@ static void wake_up_ctx(struct mtk_vcodec_ctx *ctx)
> wake_up_interruptible(&ctx->queue);
> }
>
> +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("not support hw arch:%d",
> + dev->vdec_pdata->hw_arch);
> + return MTK_VDEC_NO_HW;
> + }
> +}
> +
> static struct component_match *mtk_vcodec_match_add(
> struct mtk_vcodec_dev *vdec_dev)
> {
> @@ -246,7 +260,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);
> @@ -260,7 +274,19 @@ 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);
> +
> + if (ctx->dev->is_support_comp) {
> + hw_count = mtk_vcodec_get_hw_count(dev);
> + if (!hw_count) {
> + ret = -EINVAL;
> + goto err_init_queue;
> + }
> + for (i = 0; i < hw_count; i++)
> + init_waitqueue_head(&ctx->core_queue[i]);
> + } else {
> + init_waitqueue_head(&ctx->queue);
> + }
> +
> mutex_init(&ctx->lock);
>
> ctx->type = MTK_INST_DECODER;
> @@ -317,6 +343,7 @@ static int fops_vcodec_open(struct file *file)
> err_m2m_ctx_init:
> v4l2_ctrl_handler_free(&ctx->ctrl_hdl);
> err_ctrls_setup:
> +err_init_queue:
> v4l2_fh_del(&ctx->fh);
> v4l2_fh_exit(&ctx->fh);
> kfree(ctx);
> 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 ea6d289d9773..34d51fe409c6 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
> @@ -59,11 +59,12 @@ static const struct component_ops mtk_vdec_hw_component_ops = {
> .unbind = mtk_vdec_comp_unbind,
> };
>
> -/* Wake up context wait_queue */
> -static void mtk_vdec_comp_wake_up_ctx(struct mtk_vcodec_ctx *ctx)
> +/* Wake up core context wait_queue */
> +static void mtk_vdec_comp_wake_up_ctx(struct mtk_vcodec_ctx *ctx,
> + unsigned int hw_id)
> {
> - ctx->int_cond = 1;
> - wake_up_interruptible(&ctx->queue);
> + ctx->int_core_cond[hw_id] = 1;
> + wake_up_interruptible(&ctx->core_queue[hw_id]);
> }
>
> static irqreturn_t mtk_vdec_comp_irq_handler(int irq, void *priv)
> @@ -94,7 +95,7 @@ static irqreturn_t mtk_vdec_comp_irq_handler(int irq, void *priv)
> writel(readl(vdec_misc_addr) | VDEC_IRQ_CFG, vdec_misc_addr);
> writel(readl(vdec_misc_addr) & ~VDEC_IRQ_CLR, vdec_misc_addr);
>
> - mtk_vdec_comp_wake_up_ctx(ctx);
> + mtk_vdec_comp_wake_up_ctx(ctx, dev->comp_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 9d05ee72b2a7..76160b6f4152 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> @@ -109,6 +109,16 @@ enum mtk_vdec_hw_id {
> MTK_VDEC_HW_MAX,
> };
>
> +/**
> + * struct 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
> */
> @@ -261,6 +271,11 @@ struct vdec_pic_info {
> * finish
> * @irq_status: irq status
> *
> + * @int_core_cond: variable used by the waitqueue for component arch
> + * @int_core_type: type of the last interrupt for component arch
> + * @core_queue: waitqueue that can be used to wait for this context to
> + * finish for component arch
> + *
> * @ctrl_hdl: handler for v4l2 framework
> * @decode_work: worker for the decoding
> * @encode_work: worker for the encoding
> @@ -303,6 +318,10 @@ struct mtk_vcodec_ctx {
> wait_queue_head_t queue;
> unsigned int irq_status;
>
> + int int_core_cond[MTK_VDEC_HW_MAX];
> + int int_core_type[MTK_VDEC_HW_MAX];
> + wait_queue_head_t core_queue[MTK_VDEC_HW_MAX];
can't the code be generalized so that, instead of having both fields
'core_queue' and 'queue' and both fields
'core_cond' + 'int_code' / 'core_type' + 'int_type' that only one of them is used
we can have only the array version of the fields and access the index 0 if only one is used.
So for example instead of accessing 'queue' field we can access 'core_queue[0]' etc and we can remove the field 'queue' from the struct.
This why we don't need both "mtk_vcodec_wait_for_done_ctx" and "mtk_vcodec_wait_for_comp_done_ctx"
for example.
> +
> struct v4l2_ctrl_handler ctrl_hdl;
> struct work_struct decode_work;
> struct work_struct encode_work;
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
> index 70580c2525ba..306358d9bef0 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
> @@ -11,7 +11,7 @@
> #include "mtk_vcodec_intr.h"
> #include "mtk_vcodec_util.h"
>
> -int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx *ctx, int command,
> +int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx *ctx, int command,
This line just remove an extra space? better remove from this patch
> unsigned int timeout_ms)
> {
> wait_queue_head_t *waitqueue;
> @@ -43,3 +43,33 @@ int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx *ctx, int command,
> return status;
> }
> EXPORT_SYMBOL(mtk_vcodec_wait_for_done_ctx);
> +
> +int mtk_vcodec_wait_for_comp_done_ctx(struct mtk_vcodec_ctx *ctx,
> + int command, unsigned int timeout_ms, unsigned hw_id)
> +{
> + long timeout_jiff, ret;
> + int status = 0;
> +
> + timeout_jiff = msecs_to_jiffies(timeout_ms);
> + ret = wait_event_interruptible_timeout(ctx->core_queue[hw_id],
> + ctx->int_core_cond[hw_id],
> + timeout_jiff);
> +
> + if (!ret) {
> + status = -1; /* timeout */
> + mtk_v4l2_err("[%d] cmd=%d, type=%d, dec timeout=%ums (%d %d)",
> + ctx->id, command, ctx->type, timeout_ms,
> + ctx->int_core_cond[hw_id], ctx->int_core_type[hw_id]);
> + } else if (-ERESTARTSYS == ret) {
> + status = -1;
> + mtk_v4l2_err("[%d] cmd=%d, type=%d, dec inter fail (%d %d)",
> + ctx->id, command, ctx->type,
> + ctx->int_core_cond[hw_id], ctx->int_core_type[hw_id]);
> + }
> +
> + ctx->int_core_cond[hw_id] = 0;
> + ctx->int_core_type[hw_id] = 0;
> +
> + return status;
> +}
> +EXPORT_SYMBOL(mtk_vcodec_wait_for_comp_done_ctx);
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
> index 638cd1f3526a..5ca611a1ddab 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
> @@ -12,7 +12,9 @@
> struct mtk_vcodec_ctx;
>
> /* timeout is ms */
> -int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx *data, int command,
> +int mtk_vcodec_wait_for_done_ctx(struct mtk_vcodec_ctx *ctx, int command,
I would remove this line since it does not belong to the patch
Thanks,
Dafna
> unsigned int timeout_ms);
> +int mtk_vcodec_wait_for_comp_done_ctx(struct mtk_vcodec_ctx *ctx,
> + int command, unsigned int timeout_ms, unsigned int hw_id);
>
> #endif /* _MTK_VCODEC_INTR_H_ */
>
More information about the linux-arm-kernel
mailing list