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 32E74D711CD for ; Thu, 18 Dec 2025 23:29:44 +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=2U4ckbz3Y1LobTNmiCyNrnFTNMO5MIYwkHTIcR4ZbAw=; b=Eujiv+cs6f1mQi h14xGtHD/VDDHu2khEf+GskFI8OQDbJAXqTHHOrACOuR+26wni/tYmZjVmaa3UEHLz9H/NHDv4tTf k9UiTB3lDSNu/DVNe9lKCnPS49AO97yUu/RN2R1csPNDaFAVh5av77AweDt5kD1+KFdCBBQG/en5B M4synxDKw480ftfA1VdymXFS48/CRLjT06XSDDB8TuAbKpvy0WnhlqBP5Bq30yH8mUGn+WWGkkf/P PjByve83DaiSBbCdwLQ71fu9WdXHNQRG26/lBuIR26V4BlZqEtaR9GBw3W8SRxHftHGgsgK2BqkY8 X684XtPYZm25+/ExSu8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWNR6-00000009KXO-1aM3; Thu, 18 Dec 2025 23:29:32 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWNQs-00000009K2s-1xI4; Thu, 18 Dec 2025 23:29:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1766100543; bh=ZEGBz1FCVl0fR3pfegZGsHwXpHzV3xPQaH5hpaCSvk8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PeDoACR9kbfy2ApM1GuJcbGKyz1ogn8hesnEovlHT+POFJW7JoEDB54SFtX0xGl7N pc3OOyM52Go0sZMiCFTWf8KINVMJKHqx9d0FgnICs8AYAlfnnuHs7Te4qIJL+bvw/Q gLI8Lc0wCKHlldbfx9LLCUfSKrmydMfsb7+fZ2Rw7quI4x/Ud2nO2ls2hHs5ovh5Jh rJr3U9xg5mrVFbxAX1NJoND05b14o3ZORVcnLiS9gMHLg5rDN7j6GolwXXbQF8JcUo JFgjsxX5OPFUexqfk1oRmmlSd7fjB2SWzc/cCWr8tg6FUNWhgIem30adfYztCV6ZBZ 93k2XWGmZ7knQ== Received: from earth.mtl.collabora.ca (mtl.collabora.ca [66.171.169.34]) (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 11CA117E1520; Fri, 19 Dec 2025 00:29:00 +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 , Pavan Bobba , Sakari Ailus , James Cowgill , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, Jonas Karlman , Diederik de Haas Subject: [PATCH v7 11/17] media: rkvdec: Support per-variant interrupt handler Date: Thu, 18 Dec 2025 18:28:21 -0500 Message-ID: <20251218232829.337811-12-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251218232829.337811-1-detlev.casanova@collabora.com> References: <20251218232829.337811-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-20251218_152918_736442_D3B6B149 X-CRM114-Status: GOOD ( 12.76 ) 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 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/media/platform/rockchip/rkvdec/rkvdec.c index ff6a09e45462e..174536ebdcc7c 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) } } -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; @@ -1246,6 +1245,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_variant *variant = 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) } } +static const struct rkvdec_variant_ops rk3399_variant_ops = { + .irq_handler = rk3399_irq_handler, +}; + static const struct rkvdec_variant rk3288_rkvdec_variant = { .num_regs = 68, .coded_fmts = rk3288_coded_fmts, .num_coded_fmts = ARRAY_SIZE(rk3288_coded_fmts), + .ops = &rk3399_variant_ops, }; static const struct rkvdec_variant rk3328_rkvdec_variant = { .num_regs = 109, .coded_fmts = rkvdec_coded_fmts, .num_coded_fmts = ARRAY_SIZE(rkvdec_coded_fmts), + .ops = &rk3399_variant_ops, .quirks = RKVDEC_QUIRK_DISABLE_QOS, }; @@ -1278,6 +1292,7 @@ static const struct rkvdec_variant rk3399_rkvdec_variant = { .num_regs = 78, .coded_fmts = rkvdec_coded_fmts, .num_coded_fmts = ARRAY_SIZE(rkvdec_coded_fmts), + .ops = &rk3399_variant_ops, }; static const struct of_device_id of_rkvdec_match[] = { diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h index 751f39afe7e2d..faabedd2b9d88 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); } +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; }; -- 2.52.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip