From nobody Sun Oct 5 05:29:33 2025 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 D63BB2512FF; Fri, 8 Aug 2025 20:03:59 +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=1754683441; cv=none; b=gxWnxDpNUZFHFs0q3ynqM726IZr10HSTdCbDfs4oqqGJ1LfgJJEdGZ/1hSaqR/DF/AIZqn4imABGp6ue9QuqvzlaoMXY61zsdYKRP8zdlMTBhRk9cJNoVD1y6KXFJKQfqOSmHCjqMGdCifInKlQkOpnjG+JrGu0mh2rCvfhwfzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754683441; c=relaxed/simple; bh=cbLO7Ma+EdkDC2QdAiRI6lSh1FAiq/Nz4F7fvMKPYho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nUobnBRztO5Ue8s2k96MsAJ8CnNIgRp8xTrQkABjZ5KY1YN1SuDvLkMMd56i1Y8gvNn8ere5DnpU8AkWVwJlkqOlolWbgXzbRIEvwGbwcHh0696exjxbmvb9m2J5s6SbcYSuK4Dp7Ct6CTYwy0E/Z7zbSRHd9xbMXtQIy1tNUNE= 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=WEb1nipY; 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="WEb1nipY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1754683437; bh=cbLO7Ma+EdkDC2QdAiRI6lSh1FAiq/Nz4F7fvMKPYho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WEb1nipYM+UwqlmseEJla8tXRFuua05YVCYDZGOC1k9lihyuALgTkn47kwCEfMpto 23aXy/ev0zNixZL7JbVReNkKVWwPCFNWV+qIszgEI84wK6DQwmxJEEcrxed51qPI/n Ne6IY8u0O3Z38v+o+xruyOIkOLeUPOszu60l990UVdgnrzNHyhoQ7RIrPK2oQzfJR6 aZIV8C4zM6juBor2OB48Dx4tSpFAkea4+fEGHjov/4Raixb19IyeFihzBNMkw6K/bv FD05THxM/oO80JtOZi5HNFS/dHPJwBHih+hKKIo2k9sH5Xe+b5eeKm6T5puf08I5DB EshYA/f8K5FBA== 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 95EC417E132A; Fri, 8 Aug 2025 22:03:56 +0200 (CEST) From: Detlev Casanova To: linux-kernel@vger.kernel.org Cc: Detlev Casanova , Mauro Carvalho Chehab , Heiko Stuebner , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com Subject: [PATCH v2 07/12] media: rkvdec: Support per-variant interrupt handler Date: Fri, 8 Aug 2025 16:03:29 -0400 Message-ID: <20250808200340.156393-8-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250808200340.156393-1-detlev.casanova@collabora.com> References: <20250808200340.156393-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. 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 2602676a047a1..5f3057e8136b5 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -1102,10 +1102,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 @@ -1126,6 +1125,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); + struct rkvdec_config *cfg =3D rkvdec->config; + + return cfg->irq_handler(ctx); +} + static void rkvdec_watchdog_func(struct work_struct *work) { struct rkvdec_dev *rkvdec; @@ -1144,6 +1152,7 @@ static void rkvdec_watchdog_func(struct work_struct *= work) const struct rkvdec_config config_rkvdec =3D { .coded_fmts =3D (struct rkvdec_coded_fmt_desc *)rkvdec_coded_fmts, .coded_fmts_num =3D ARRAY_SIZE(rkvdec_coded_fmts), + .irq_handler =3D rk3399_irq_handler, }; =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 3a073883d21eb..679de66df2479 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.h +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.h @@ -107,6 +107,7 @@ struct rkvdec_config { size_t coded_fmts_num; 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.50.1