[PATCH v4 10/15] media: rkvdec: Support per-variant interrupt handler

[Nicolas Dufresne]

Le mercredi 22 octobre 2025 à 13:45 -0400, Detlev Casanova a écrit :
> Preparation commit for supporting different variants with different
> interrupt management.
> 
> Tested-by: Diederik de Haas <didi.debian at cknow.org>  # Rock 5B
> Signed-off-by: Detlev Casanova <detlev.casanova at collabora.com>
> ---
>  drivers/media/platform/rockchip/rkvdec/rkvdec.c | 15 ++++++++++++---
>  drivers/media/platform/rockchip/rkvdec/rkvdec.h |  1 +
>  2 files changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
> index 5dd486edd64d..b0e90c9b826e 100644
> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c
> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
> @@ -1218,10 +1218,9 @@ static void rkvdec_iommu_restore(struct rkvdec_dev *rkvdec)
>  	}
>  }
>  
> -static irqreturn_t rkvdec_irq_handler(int irq, void *priv)
> +static irqreturn_t rk3399_irq_handler(struct rkvdec_ctx *ctx)
>  {
> -	struct rkvdec_dev *rkvdec = priv;
> -	struct rkvdec_ctx *ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
> +	struct rkvdec_dev *rkvdec = ctx->dev;
>  	enum vb2_buffer_state state;
>  	u32 status;
>  
> @@ -1242,6 +1241,15 @@ static irqreturn_t rkvdec_irq_handler(int irq, void *priv)
>  	return IRQ_HANDLED;
>  }
>  
> +static irqreturn_t rkvdec_irq_handler(int irq, void *priv)
> +{
> +	struct rkvdec_dev *rkvdec = priv;
> +	struct rkvdec_ctx *ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
> +	const struct rkvdec_config *cfg = rkvdec->variant->config;
> +
> +	return cfg->irq_handler(ctx);
> +}
> +
>  static void rkvdec_watchdog_func(struct work_struct *work)
>  {
>  	struct rkvdec_dev *rkvdec;
> @@ -1260,6 +1268,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
>  static const struct rkvdec_config config_rkvdec = {
>  	.coded_fmts = rkvdec_coded_fmts,
>  	.coded_fmts_num = ARRAY_SIZE(rkvdec_coded_fmts),
> +	.irq_handler = rk3399_irq_handler,
>  };
>  
>  static const struct rkvdec_variant rk3288_rkvdec_variant = {
> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h
> index 74f71542e031..dfafb2c2cbc1 100644
> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h
> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h
> @@ -121,6 +121,7 @@ struct rkvdec_config {
>  	size_t coded_fmts_num;
>  	const struct rcb_size_info *rcb_size_info;
>  	size_t rcb_num;
> +	irqreturn_t (*irq_handler)(struct rkvdec_ctx *ctx);

Its a tiny little odd to mix function pointers and configuration. I don't have a
great proposal, is that going to be the only function pointer ? perhaps cg->ops
? I'm not sure. Its just a small annoyance, I'll leave to you.

Nicolas

>  };
>  
>  struct rkvdec_dev {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-rockchip/attachments/20251210/dcd48f3a/attachment.sig>