From nobody Mon Feb 9 23:15:28 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 1F1EA2EAB99; Wed, 22 Oct 2025 17:45:42 +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=1761155145; cv=none; b=ZBLmnHPNWFXKgtRPftNH8iJvBI73EK5Av50/iH70dVzjsCRdqUCDRaL41AsnxEF0EkKTOjn2pOAQa4Z7/jMBYDLrtXG1p7+owJR8k19SQbgTstBfu99VeEO19PRXybBGsanGfS1IeW2Js/s+XaI5HVbIUSVEHErRGNIZLSODT0c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761155145; c=relaxed/simple; bh=dAFQDps3eAP+w+7ZBAZcwTH8VtKHFGKFfeZJsJy7sx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XX+WrfgmnFX1OxrF5wJK+8RSb2zfdPrcYdxuTNdSkd8o5C5pIpia3OEoVUkizIykKW1fQsnwfV1YL++4r+/Hh78n67LckIsQKD4V/BLxdNB6pEEfbOv+NayYMqn+hZHbPx6TjCXXnHm3/BQy4hMvmNis3h/wbPGMvKhGHNITxLo= 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=nvc9lUwu; 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="nvc9lUwu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1761155141; bh=dAFQDps3eAP+w+7ZBAZcwTH8VtKHFGKFfeZJsJy7sx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nvc9lUwu7w7E0Kk2dVm4lvQt3vZfcpWutK77VwNNMuI8Ycrok+LnzGABe2JIRj5jN LjkxAsu4By94nndNAxTdqJ2eplnjPnt5nX28xusX4xM2GqbvAhnzglw3a+d1OygJcU z1SxzIisG/SUVZwhhy5hQU3LUE7U+U/Hzk4MBxECaq7QfJ7EM9/9CqtmBytgcOKbiV nrTvCkl30phbH+JfK3uoWOSl9OTZSriPkAdtkpbGVXIpwUbD4zyycBx0aV0IlVJdId nPq9j6EOwUendNsEOeO2SyR8ZWvtS57OBbsF4kx2wuWHfXciUwnwIO6PbFb8lIU10c tpY1vP7IkJV5Q== Received: from trenzalore (unknown [23.233.251.139]) (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 099D317E00AC; Wed, 22 Oct 2025 19:45:38 +0200 (CEST) From: Detlev Casanova To: linux-kernel@vger.kernel.org Cc: Mauro Carvalho Chehab , Detlev Casanova , Ezequiel Garcia , Heiko Stuebner , Ricardo Ribalda , Hans Verkuil , Hans de Goede , Yunke Cao , Jonathan Corbet , Laurent Pinchart , Sakari Ailus , James Cowgill , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, Nicolas Dufresne , Diederik de Haas Subject: [PATCH v4 10/15] media: rkvdec: Support per-variant interrupt handler Date: Wed, 22 Oct 2025 13:45:02 -0400 Message-ID: <20251022174508.284929-11-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.51.1.dirty In-Reply-To: <20251022174508.284929-1-detlev.casanova@collabora.com> References: <20251022174508.284929-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" Preparation commit for supporting different variants with different interrupt management. Tested-by: Diederik de Haas # Rock 5B Signed-off-by: Detlev Casanova --- 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/medi= a/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) } } =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_config *cfg =3D 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 =3D { .coded_fmts =3D rkvdec_coded_fmts, .coded_fmts_num =3D ARRAY_SIZE(rkvdec_coded_fmts), + .irq_handler =3D rk3399_irq_handler, }; =20 static const struct rkvdec_variant rk3288_rkvdec_variant =3D { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/medi= a/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); }; =20 struct rkvdec_dev { --=20 2.51.1.dirty