lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7, 02/15] media: mtk-vcodec: Align vcodec wake up interrupt interface
    Date
    Vdec and venc can use the same function to wake up interrupt event.

    Reviewed-by: Tzung-Bi Shih <tzungbi@google.com>
    Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
    ---
    drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 9 +--------
    drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 8 ++++++++
    drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 8 --------
    3 files changed, 9 insertions(+), 16 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 983e0f2831af..8db9cdc66043 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
    @@ -31,13 +31,6 @@
    module_param(mtk_v4l2_dbg_level, int, 0644);
    module_param(mtk_vcodec_dbg, bool, 0644);

    -/* Wake up context wait_queue */
    -static void wake_up_ctx(struct mtk_vcodec_ctx *ctx)
    -{
    - ctx->int_cond = 1;
    - wake_up_interruptible(&ctx->queue);
    -}
    -
    static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv)
    {
    struct mtk_vcodec_dev *dev = priv;
    @@ -69,7 +62,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);
    + wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED);

    mtk_v4l2_debug(3,
    "mtk_vcodec_dec_irq_handler :wake up ctx %d, dec_done_status=%x",
    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
    index d4f840a7bbcb..3b1e5e3a450e 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
    @@ -472,4 +472,12 @@ static inline struct mtk_vcodec_ctx *ctrl_to_ctx(struct v4l2_ctrl *ctrl)
    return container_of(ctrl->handler, struct mtk_vcodec_ctx, ctrl_hdl);
    }

    +/* Wake up context wait_queue */
    +static inline void wake_up_ctx(struct mtk_vcodec_ctx *ctx, unsigned int reason)
    +{
    + ctx->int_cond = 1;
    + ctx->int_type = reason;
    + wake_up_interruptible(&ctx->queue);
    +}
    +
    #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 4167e865b23f..2828df77020c 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
    @@ -73,14 +73,6 @@ static const struct mtk_video_fmt mtk_video_formats_capture_mt8183[] = {
    },
    };

    -/* Wake up context wait_queue */
    -static void wake_up_ctx(struct mtk_vcodec_ctx *ctx, unsigned int reason)
    -{
    - ctx->int_cond = 1;
    - ctx->int_type = reason;
    - wake_up_interruptible(&ctx->queue);
    -}
    -
    static void clean_irq_status(unsigned int irq_status, void __iomem *addr)
    {
    if (irq_status & MTK_VENC_IRQ_STATUS_PAUSE)
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-10-11 09:03    [W:4.259 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site