| Message ID | 20211129034201.5767-3-yunfei.dong@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support multi hardware decode using of_platform_populate | expand |
LGTM. On Sun, Nov 28, 2021 at 7:44 PM Yunfei Dong <yunfei.dong@mediatek.com> wrote: > > Vdec and venc can use the same function to wake up interrupt event. > > Reviewed-by: Tzung-Bi Shih <tzungbi@google.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.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 59caf2163349..055d50e52720 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); Assuming setting up reason doesn't change functionality. > > 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 581522177308..1d2370608d0d 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > @@ -473,4 +473,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 eed67394cf46..7c3487fb3498 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > @@ -65,14 +65,6 @@ static const struct mtk_video_fmt mtk_video_formats_capture_vp8[] = { > }, > }; > > -/* 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 >
Reviewed-by: Steve Cho <stevecho@chromium.org> On Wed, Dec 1, 2021 at 3:55 PM Steve Cho <stevecho@chromium.org> wrote: > > LGTM. > > On Sun, Nov 28, 2021 at 7:44 PM Yunfei Dong <yunfei.dong@mediatek.com> wrote: > > > > Vdec and venc can use the same function to wake up interrupt event. > > > > Reviewed-by: Tzung-Bi Shih <tzungbi@google.com> > > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.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 59caf2163349..055d50e52720 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); > > Assuming setting up reason doesn't change functionality. > > > > > 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 581522177308..1d2370608d0d 100644 > > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > > @@ -473,4 +473,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 eed67394cf46..7c3487fb3498 100644 > > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > > @@ -65,14 +65,6 @@ static const struct mtk_video_fmt mtk_video_formats_capture_vp8[] = { > > }, > > }; > > > > -/* 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 > >
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 59caf2163349..055d50e52720 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 581522177308..1d2370608d0d 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -473,4 +473,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 eed67394cf46..7c3487fb3498 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c @@ -65,14 +65,6 @@ static const struct mtk_video_fmt mtk_video_formats_capture_vp8[] = { }, }; -/* 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)