[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250708151946.374349-8-detlev.casanova@collabora.com>
Date: Tue, 8 Jul 2025 11:19:40 -0400
From: Detlev Casanova <detlev.casanova@...labora.com>
To: linux-kernel@...r.kernel.org
Cc: Detlev Casanova <detlev.casanova@...labora.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Heiko Stuebner <heiko@...ech.de>,
linux-media@...r.kernel.org,
linux-rockchip@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org,
kernel@...labora.com,
Nicolas Frattaroli <nicolas.frattaroli@...labora.com>,
Nicolas Dufresne <nicolas.dufresne@...labora.com>
Subject: [PATCH 07/12] media: rkvdec: Support per-variant interrupt handler
Preparation commit for supporting different variants with different
interrupt management.
Signed-off-by: Detlev Casanova <detlev.casanova@...labora.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 3285dd910c327..d5d69ee56cb62 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
@@ -1102,10 +1102,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;
@@ -1126,6 +1125,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);
+ struct rkvdec_config *cfg = rkvdec->config;
+
+ return cfg->irq_handler(ctx);
+}
+
static void rkvdec_watchdog_func(struct work_struct *work)
{
struct rkvdec_dev *rkvdec;
@@ -1144,6 +1152,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
const struct rkvdec_config config_rkvdec = {
.coded_fmts = (struct rkvdec_coded_fmt_desc *)rkvdec_coded_fmts,
.coded_fmts_num = ARRAY_SIZE(rkvdec_coded_fmts),
+ .irq_handler = rk3399_irq_handler,
};
static const struct of_device_id of_rkvdec_match[] = {
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h
index 3a073883d21eb..679de66df2479 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h
@@ -107,6 +107,7 @@ struct rkvdec_config {
size_t coded_fmts_num;
struct rcb_size_info *rcb_size_info;
size_t rcb_num;
+ irqreturn_t (*irq_handler)(struct rkvdec_ctx *ctx);
};
struct rkvdec_dev {
--
2.50.0
Powered by blists - more mailing lists