From nobody Mon Feb 9 08:28:31 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B68D2E0407; Wed, 17 Dec 2025 17:42:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765993340; cv=none; b=LypHBkdv4LLKnbhW7WW3r8U8CotEQadr8Rbm5VWfy2zXloEilxGNuf6yNuDnQtap/OdGxm9zENYD1aR1+hor7trT20FSpMTYHarQWoO0Ygbvqr4cyYeZfEHQIZdgr3quUR51qXEQQPDwhkNTbOtmvkqUiEu3EUI5R7A/uERKJ70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765993340; c=relaxed/simple; bh=+TRiYgl08rNkFaM3t42YMlGvmtQjNcHF4oNn/XuyM/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=imcOPd2/iXFtW3VWTzen5WvpsB5FQ3rWmBC+YoGWExaMvDU+RLcJAEdS1nrT4yF6KCzaY8oGEVF2c3eDT3eGasBDpIWZEfa7t24Mc6PqHDxakPMsj5QFpvcGwylx1D4Ho7ZEfliuh0gESTvNskdqmHszBGDAj/ZWDSoOKirbvZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=RlAvrCVJ; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="RlAvrCVJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1765993336; bh=+TRiYgl08rNkFaM3t42YMlGvmtQjNcHF4oNn/XuyM/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RlAvrCVJ17ApUaYSDtskrdL6cTsjIRpLCecaNnT83RAP1ISJJ97tkdWsCmrtjM/1D /HmrGPN4+mFCTtCBZUkRk4AzCieYaMQL2Xd6O1rs1siMjhc/w8Pzg7cUynaDBPoALn xfohn8cnXMZjd1exAi8BTJh0DW7wTWiP80NtlN64z9avOX1gEB2NT824BaygMrHoCB 4Y7hI/lgikNa68x6odcLq+29dBs1PK0frnm7uA59J7xjKeOnzctu7gvR/sKOA9blxM 9kqWrMqcbECN2GNX/cpR0wlrc8Ht4hv7NPRVEp25s89pkVPRAZrZKiMxZuTpdLj3Xs Vs1WS3SbCBACw== Received: from trenzalore (modemcable014.2-22-96.mc.videotron.ca [96.22.2.14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 3A2D017E1520; Wed, 17 Dec 2025 18:42:14 +0100 (CET) From: Detlev Casanova To: linux-kernel@vger.kernel.org Cc: Mauro Carvalho Chehab , Detlev Casanova , Ezequiel Garcia , Heiko Stuebner , Daniel Almeida , Jonathan Corbet , Ricardo Ribalda , Hans Verkuil , Yunke Cao , Hans de Goede , Laurent Pinchart , Nicolas Dufresne , Sakari Ailus , Pavan Bobba , James Cowgill , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, Diederik de Haas Subject: [PATCH v6 11/17] media: rkvdec: Support per-variant interrupt handler Date: Wed, 17 Dec 2025 12:40:48 -0500 Message-ID: <20251217174059.1341784-12-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251217174059.1341784-1-detlev.casanova@collabora.com> References: <20251217174059.1341784-1-detlev.casanova@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Prepare for supporting different variants with different interrupt managers. To support other variants specific function type later, introduce the rkvdec_variant_ops struct. Tested-by: Diederik de Haas # Rock 5B Signed-off-by: Detlev Casanova --- .../media/platform/rockchip/rkvdec/rkvdec.c | 21 ++++++++++++++++--- .../media/platform/rockchip/rkvdec/rkvdec.h | 5 +++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.c index 028ce8e1c4ca..87373a6d9573 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) } } =20 -static irqreturn_t rkvdec_irq_handler(int irq, void *priv) +static irqreturn_t rk3399_irq_handler(struct rkvdec_ctx *ctx) { - struct rkvdec_dev *rkvdec =3D priv; - struct rkvdec_ctx *ctx =3D v4l2_m2m_get_curr_priv(rkvdec->m2m_dev); + struct rkvdec_dev *rkvdec =3D ctx->dev; enum vb2_buffer_state state; u32 status; =20 @@ -1242,6 +1241,15 @@ static irqreturn_t rkvdec_irq_handler(int irq, void = *priv) return IRQ_HANDLED; } =20 +static irqreturn_t rkvdec_irq_handler(int irq, void *priv) +{ + struct rkvdec_dev *rkvdec =3D priv; + struct rkvdec_ctx *ctx =3D v4l2_m2m_get_curr_priv(rkvdec->m2m_dev); + const struct rkvdec_variant *variant =3D rkvdec->variant; + + return variant->ops->irq_handler(ctx); +} + static void rkvdec_watchdog_func(struct work_struct *work) { struct rkvdec_dev *rkvdec; @@ -1257,10 +1265,15 @@ static void rkvdec_watchdog_func(struct work_struct= *work) } } =20 +static const struct rkvdec_variant_ops rk3399_variant_ops =3D { + .irq_handler =3D rk3399_irq_handler, +}; + static const struct rkvdec_variant rk3288_rkvdec_variant =3D { .num_regs =3D 68, .coded_fmts =3D rkvdec_coded_fmts, .num_coded_fmts =3D ARRAY_SIZE(rkvdec_coded_fmts), + .ops =3D &rk3399_variant_ops, .capabilities =3D RKVDEC_CAPABILITY_HEVC, }; =20 @@ -1268,6 +1281,7 @@ static const struct rkvdec_variant rk3328_rkvdec_vari= ant =3D { .num_regs =3D 109, .coded_fmts =3D rkvdec_coded_fmts, .num_coded_fmts =3D ARRAY_SIZE(rkvdec_coded_fmts), + .ops =3D &rk3399_variant_ops, .capabilities =3D RKVDEC_CAPABILITY_HEVC | RKVDEC_CAPABILITY_H264 | RKVDEC_CAPABILITY_VP9, @@ -1278,6 +1292,7 @@ static const struct rkvdec_variant rk3399_rkvdec_vari= ant =3D { .num_regs =3D 78, .coded_fmts =3D rkvdec_coded_fmts, .num_coded_fmts =3D ARRAY_SIZE(rkvdec_coded_fmts), + .ops =3D &rk3399_variant_ops, .capabilities =3D RKVDEC_CAPABILITY_HEVC | RKVDEC_CAPABILITY_H264 | RKVDEC_CAPABILITY_VP9, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.h index 77c0950a465d..12e53d591362 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -71,12 +71,17 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) base.vb.vb2_buf); } =20 +struct rkvdec_variant_ops { + irqreturn_t (*irq_handler)(struct rkvdec_ctx *ctx); +}; + struct rkvdec_variant { unsigned int num_regs; const struct rkvdec_coded_fmt_desc *coded_fmts; size_t num_coded_fmts; const struct rcb_size_info *rcb_sizes; size_t num_rcb_sizes; + const struct rkvdec_variant_ops *ops; unsigned int capabilities; unsigned int quirks; }; --=20 2.52.0