From mboxrd@z Thu Jan 1 00:00:00 1970 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 BC9C2343D6B; Wed, 27 Aug 2025 09:08:20 +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=1756285704; cv=none; b=WjvAgNFYAeDi8CIUWdMF754mhUUlllax4aztTWa2J/namUkr3tMKc2lbM9tJJgCUrTYo9pNvLDcRdAVeEjiNWkQMMj+Fn/y2/k2BQcJ1TufD6hW0dW7NzCxPiJJ+Bfn42clldmv4NWEcdp16QUf+Sx1IJyttPxvrDrjPVMPlQG8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756285704; c=relaxed/simple; bh=fSEDJQdHU1SuscOgEMkZ22GTdBhS9AvlLkV6KIF1DFA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=leKFVvvIiug4sGMvD0VT3GwP/w8vkD09U3gf+TzJ6NTkIjPY2YrwiZ+ThOqsBJ6wV3xjrGRPifAIowjDibwF4EvcPXhjiFUmBoT/8Y6kIydTK3VTujKTDFVib79kjjuwuLK0akMDwRn0Iovt9GO9LwZUzUgeasE3xW/cTsRDCAM= 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=qiFIVQqc; 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="qiFIVQqc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1756285698; bh=fSEDJQdHU1SuscOgEMkZ22GTdBhS9AvlLkV6KIF1DFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qiFIVQqccBmTMj7g0Qc1tuVme7cOdQGaqzDe+iL1rUuEMp75uOmDTuz3RUloFl6jB 8ClcX+NUqm9bQ8IQr8EfFM1+Uhnn1qktAyQsqHX39IE7G41QfJdMFzsbrZsEqa2m8P di1U3LentnQTTwWq2/KcHeFihisXZ6wt7A0k3YXjYFF1hRbSEXrfY89+AD36rZiVHG N2Sn3zWLfti6BZRejws8sa0tTVsF/BvSe2x3vBON/3ARtNgb0r6FD1lGH0V6ipSTF/ HTqlv9zqnAHKNBR1e04VaWMg54sKV39I+Pzm8ydzVq6ctDEAbKl7qVeNx8tJbgqCjD p2VHhxwkXLCgg== Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:4be:99b9:5069:3bef]) (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: benjamin.gaignard) by bali.collaboradmins.com (Postfix) with ESMTPSA id DA8D017E0FC2; Wed, 27 Aug 2025 11:08:17 +0200 (CEST) From: Benjamin Gaignard To: joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, heiko@sntech.de, nicolas.dufresne@collabora.com, jgg@ziepe.ca, p.zabel@pengutronix.de, mchehab@kernel.org Cc: iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, kernel@collabora.com, linux-media@vger.kernel.org, Benjamin Gaignard Subject: [PATCH v8 5/7] media: verisilicon: AV1: Restore IOMMU context before decoding a frame Date: Wed, 27 Aug 2025 11:08:01 +0200 Message-ID: <20250827090809.34555-6-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250827090809.34555-1-benjamin.gaignard@collabora.com> References: <20250827090809.34555-1-benjamin.gaignard@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: 8bit AV1 is a stateless decoder which means multiple AV1 bitstreams could be decoded at the same time using the same hardware block. Before decoding a frame it is needed to restore the iommu tables to avoid mixing decode contexts. Signed-off-by: Benjamin Gaignard --- .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c b/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c index e4703bb6be7c..9e7a7d9ad58a 100644 --- a/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +++ b/drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c @@ -5,6 +5,9 @@ * Author: Benjamin Gaignard */ +#include +#include + #include #include "hantro.h" #include "hantro_v4l2.h" @@ -2095,12 +2098,23 @@ rockchip_vpu981_av1_dec_set_output_buffer(struct hantro_ctx *ctx) hantro_write_addr(vpu, AV1_TILE_OUT_MV, mv_addr); } +static void rockchip_vpu981_av1_restore_iommu(struct hantro_ctx *ctx) +{ + struct iommu_domain *domain; + + domain = iommu_get_domain_for_dev(ctx->dev->v4l2_dev.dev); + if (domain) + vsi_iommu_restore_ctx(domain); +} + int rockchip_vpu981_av1_dec_run(struct hantro_ctx *ctx) { struct hantro_dev *vpu = ctx->dev; struct vb2_v4l2_buffer *vb2_src; int ret; + rockchip_vpu981_av1_restore_iommu(ctx); + hantro_start_prepare_run(ctx); ret = rockchip_vpu981_av1_dec_prepare_run(ctx); -- 2.43.0