From nobody Mon Feb 9 10:32:53 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 49783365A18; Fri, 9 Jan 2026 16:16: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=1767975380; cv=none; b=VkoMcHjtlc0HTxUivLvXksyKRt09tAX0AK3OcISfv8ia6GQdn3KKWqu+5S47yWky/Yqf7sTquBNowmoR0OWpd3C3O0vOfMsmS1LHNMJaRwcWOokuSK+iI7Dz7hvRQrI0VG6EDF9vBXKdjATaLtT5vCji4aZiKt7A0gQ1DVHI3yM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767975380; c=relaxed/simple; bh=gmpTefIfPlF4I8DgMdzcgz2ylhV7PMm7hs/HGAhZC44=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kaOYOSoK7ofZWTU+siWgL+xkcx6H1ucre9v5q+U8Xcn+WwooiRyUzoAVoBs0pH6gUlPR2+C2SgAVC196au1mo33ZJDifP8SRzLxQhnbqr1XzDWzcSAzmsYpkYurqx7I5DcCtc4HZEdngdZodALGyDI0k+ZaN0butOxBYJ1/Byi4= 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=FqOEhDdV; 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="FqOEhDdV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1767975376; bh=gmpTefIfPlF4I8DgMdzcgz2ylhV7PMm7hs/HGAhZC44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FqOEhDdVbn+Y68rgKs4Q2Su4nyJGrWAFlAP6P/oxitD1agrRF/RS+wlyPpvr3BaNa x/BSRQvjcQNz0kPm2UIMGlTn44AANy0KG1EK9HOxcM/JAcubhhOHo0PZSZfYz9fXwm 7cWtQ92vY5dS1q85m6JOEIR+q7rHuCGsee0FT2z6hWpg7bh7o2YX82KzA4lhXHAEM/ BnSMeZa2FlesrFwymhEVhotL9QK6lWI3bPcL/mJt1EwPkNf8B+JA9G26pOVtaC5OhA jmG8ZFuVjrZSmAnv+adA4uAzTNsl5q/ocG9K5WVzhpBveagUP+H72s037eNm5Oc/fR A1XfrKQYVE9ag== 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 F3B3F17E3856; Fri, 9 Jan 2026 17:16:13 +0100 (CET) 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 , Jonas Karlman , Diederik de Haas Subject: [PATCH v8 11/17] media: rkvdec: Support per-variant interrupt handler Date: Fri, 9 Jan 2026 11:15:27 -0500 Message-ID: <20260109161538.1294449-12-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109161538.1294449-1-detlev.casanova@collabora.com> References: <20260109161538.1294449-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 Reviewed-by: Nicolas Dufresne --- .../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 ff6a09e45462..174536ebdcc7 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -1222,10 +1222,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 @@ -1246,6 +1245,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; @@ -1261,16 +1269,22 @@ 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 rk3288_coded_fmts, .num_coded_fmts =3D ARRAY_SIZE(rk3288_coded_fmts), + .ops =3D &rk3399_variant_ops, }; =20 static const struct rkvdec_variant rk3328_rkvdec_variant =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, .quirks =3D RKVDEC_QUIRK_DISABLE_QOS, }; =20 @@ -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, }; =20 static const struct of_device_id of_rkvdec_match[] =3D { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.h index 751f39afe7e2..faabedd2b9d8 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -67,12 +67,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 quirks; }; =20 --=20 2.52.0