gpu: host1x: Add back arm_iommu_detach_device()
PATCH 1/2 gpu: host1x: Add back arm_iommu_detach_device()
The case of CONFIG_ARM_DMA_USE_IOMMU=y was found to be broken for host1x driver. Add back the workaround using arm_iommu_detach_device() as a temporary solution.
Fixes af1cbfb9bf0f ("gpu: host1x: Support DMA mapping of buffers"
Signed-off-by Dmitry Osipenko <[email protected]>
--- drivers/gpu/host1x/dev.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/host1x/dev.c +15 -0
@@ -18,6 +18,10 @@#include <trace/events/host1x.h> #undef CREATE_TRACE_POINTS +#if IS_ENABLED (CONFIG_ARM_DMA_USE_IOMMU ) +#include <asm/dma-iommu.h> +#endif +#include "bus.h" #include "channel.h" #include "debug.h"
@@ -232,6 +236,17 @@ static struct iommu_domain *host1x_iommu_attach(struct host1x *host)struct iommu_domain *domain =iommu_get_domain_for_dev (host->dev);int err; +#if IS_ENABLED (CONFIG_ARM_DMA_USE_IOMMU ) +if (host->dev->archdata.mapping) { +struct dma_iommu_mapping *mapping = +to_dma_iommu_mapping (host->dev); +arm_iommu_detach_device (host->dev); +arm_iommu_release_mapping (mapping); + + domain =iommu_get_domain_for_dev (host->dev); + } +#endif +/* * We may not always want to enable IOMMU support (for example if the * host1x firewall is already enabled and we don't support addressing
Signature · 6 lines
2.30.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 drm/tegra: Add back arm_iommu_detach_device()
The case of CONFIG_ARM_DMA_USE_IOMMU=y was found to be broken for DRM driver. Add back the workaround using arm_iommu_detach_device() as a temporary solution.
Fixes fa6661b7aa0b ("drm/tegra: Optionally attach clients to the IOMMU")
Signed-off-by Dmitry Osipenko <[email protected]>
--- drivers/gpu/drm/tegra/drm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/tegra/drm.c +15 -0
@@ -20,6 +20,10 @@#include <drm/drm_prime.h> #include <drm/drm_vblank.h> +#if IS_ENABLED (CONFIG_ARM_DMA_USE_IOMMU ) +#include <asm/dma-iommu.h> +#endif +#include "drm.h" #include "gem.h"
@@ -909,6 +913,17 @@ int host1x_client_iommu_attach(struct host1x_client *client)struct iommu_group *group =NULL ;int err; +#if IS_ENABLED (CONFIG_ARM_DMA_USE_IOMMU ) +if (client->dev->archdata.mapping) { +struct dma_iommu_mapping *mapping = +to_dma_iommu_mapping (client->dev); +arm_iommu_detach_device (client->dev); +arm_iommu_release_mapping (mapping); + + domain =iommu_get_domain_for_dev (client->dev); + } +#endif +/* * If the host1x client is already attached to an IOMMU domain that is * not the shared IOMMU domain, don't try to attach it to a different
Signature · 6 lines
2.30.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel