From nobody Mon Feb 9 04:14:29 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 38D792E0902; Thu, 23 Oct 2025 21:43:23 +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=1761255806; cv=none; b=fTkX+zl4GJex9DusL2D8TD2TSWDAO+nmWLlkt08tso1o7NXiCqo+ltJs9Sxtq/wo5uQeSf25IeDtj/e8/O3U3iwDTOq7zLltvLg/8jvVCCjud+ge3Rfhj23pBeR3en5zDXiFmk7L+qDCAYdCa5HWhUCTsGg0llf1K8jT4U9amIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761255806; c=relaxed/simple; bh=JQ27WDs4Qs+Tw1yXgxp2LvpgPLap1W5A/SH5OYrxPFk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PCfRiW7oCVSL/zKaXz9XK1ztAIsbgMxGZXr1+syTr0tZ/BJM697rYwlcokAB8zqpm3d6oQkV22ufcOxk0U6dtEEWF7EdKux8sxtmf7TZF5v+i3F5ORjU3WB8Y/aDjKvIMViy9Pv1YhmRjPD9Y6bQtbZijYqceW/TlHl5o6ughl8= 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=eR3i1XyT; 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="eR3i1XyT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1761255802; bh=JQ27WDs4Qs+Tw1yXgxp2LvpgPLap1W5A/SH5OYrxPFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eR3i1XyT33dfWDROeudnIezrRAQmQ32KCotBoBGKZZUenvFsjProAcdbrsAAdj5G8 nowV4Wkw4Lwr/YKJ1jQs7n8Jp7WXrtog9dYTc4Md9J5fMo88y1jRrtWGwoZ9AGtP/m izlKHOPsmsEWj9c2pC58gqZsAIySATJtelts5Qco80G3phruk18+v0c1yLViuH6OXp tXkxd9N+jcQWavKfWFsUTjXcNDzTf6xAhhxq1awkME7q/OLDepjmOri/LWK8RQCbOp nurFxILw3N+Oplw9NBWPeyY7vzfJqtHWbM0hPPVjWU0et+MQTesRVr60RQoiY3srBp MZpajKGV/jrBA== 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 F2BD317E0964; Thu, 23 Oct 2025 23:43:19 +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 v5 10/15] media: rkvdec: Support per-variant interrupt handler Date: Thu, 23 Oct 2025 17:42:41 -0400 Message-ID: <20251023214247.459931-11-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.51.1.dirty In-Reply-To: <20251023214247.459931-1-detlev.casanova@collabora.com> References: <20251023214247.459931-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. Tested-by: Diederik de Haas # Rock 5B Signed-off-by: Detlev Casanova --- drivers/media/platform/rockchip/rkvdec/rkvdec.c | 17 ++++++++++++++--- drivers/media/platform/rockchip/rkvdec/rkvdec.h | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.c index 028ce8e1c4ca..36193cff6448 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->irq_handler(ctx); +} + static void rkvdec_watchdog_func(struct work_struct *work) { struct rkvdec_dev *rkvdec; @@ -1261,6 +1269,7 @@ static const struct rkvdec_variant rk3288_rkvdec_vari= ant =3D { .num_regs =3D 68, .coded_fmts =3D rkvdec_coded_fmts, .num_coded_fmts =3D ARRAY_SIZE(rkvdec_coded_fmts), + .irq_handler =3D rk3399_irq_handler, .capabilities =3D RKVDEC_CAPABILITY_HEVC, }; =20 @@ -1268,6 +1277,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), + .irq_handler =3D rk3399_irq_handler, .capabilities =3D RKVDEC_CAPABILITY_HEVC | RKVDEC_CAPABILITY_H264 | RKVDEC_CAPABILITY_VP9, @@ -1278,6 +1288,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), + .irq_handler =3D rk3399_irq_handler, .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..0c36e8e9b0a3 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -77,6 +77,7 @@ struct rkvdec_variant { size_t num_coded_fmts; const struct rcb_size_info *rcb_sizes; size_t num_rcb_sizes; + irqreturn_t (*irq_handler)(struct rkvdec_ctx *ctx); unsigned int capabilities; unsigned int quirks; }; --=20 2.51.1.dirty