]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
media: omap3isp: Handle ARM dma_iommu_mapping
authorRobin Murphy <robin.murphy@arm.com>
Mon, 28 Oct 2024 17:58:36 +0000 (17:58 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:38 +0000 (14:39 +0200)
commit6b9ddc4f5f2e2698ac83e9d0824c0c91d7bb447c
treeb56629461876a00163b2f37f7dc5901c85e465cc
parent9f7ae45f0c615d0c26ce6d42f712f525764699ed
media: omap3isp: Handle ARM dma_iommu_mapping

commit 6bc076eec6f85f778f33a8242b438e1bd9fcdd59 upstream.

It's no longer practical for the OMAP IOMMU driver to trick
arm_setup_iommu_dma_ops() into ignoring its presence, so let's use the
same tactic as other IOMMU API users on 32-bit ARM and explicitly kick
the arch code's dma_iommu_mapping out of the way to avoid problems.

Fixes: 4720287c7bf7 ("iommu: Remove struct iommu_ops *iommu from arch_setup_dma_ops()")
Cc: stable@vger.kernel.org
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Sicelo A. Mhlongo <absicsz@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/platform/ti/omap3isp/isp.c