From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E295FCCF9E2 for ; Wed, 22 Oct 2025 17:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LW4MzW+rwZR4CKTiumHA2i3koShHdYGbkmzukvkYyd0=; b=t9s01tsD7sZ/4J hEzUFPLGHc93lNyykZ5r7KhOzeZNnnwl63i07y6j6hJxB9OXJNZ3rnnUAcGJKKvbkQnXDIQxRTegL dqEVAGO9YvI0YgMOwa9Jfv3eSLBh5rrJQn6YHV6R0KcA9TNKYcrKC3ptHA0DsGo3YYgK/OXB2CTDR icqdrX9Veua2AkXZoI6LJ5m8hsBUC5pUn1EzzXtlCdJSuZFtS8/zN86I2sqGy4cn7vQtopkW6xIU1 1WkQnC3Epl9WqED2iQxwpIp2/NFcgJwra0UasenlgkeO4rkm4Zxl69/12jCh1BPl6v01gB8v0va3g /DeH2ucEfDyEREkGXbxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vBcuT-00000003rYL-1j8Y; Wed, 22 Oct 2025 17:46:05 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vBcu8-00000003r51-1QNf; Wed, 22 Oct 2025 17:45:51 +0000 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251022_104544_594974_462520D5 X-CRM114-Status: GOOD ( 13.13 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org 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/media/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) } } -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; @@ -1242,6 +1241,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); + const struct rkvdec_config *cfg = 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 = { .coded_fmts = rkvdec_coded_fmts, .coded_fmts_num = ARRAY_SIZE(rkvdec_coded_fmts), + .irq_handler = rk3399_irq_handler, }; static const struct rkvdec_variant rk3288_rkvdec_variant = { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/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); }; struct rkvdec_dev { -- 2.51.1.dirty _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip