Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ac93f81 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

drm/tegra: Detach devices from IOMMU DMA domain on arm32 



All Tegra DRM devices are getting attached to an implicit IOMMU DMA
domain if CONFIG_ARM_DMA_USE_IOMMU=y. Since Tegra DRM driver manages IOMMU
by itself, the devices must be detached from the implicit domain using
arch-specific IOMMU-API. Note that this works only for arm32 and not for
arm64, which will remain broken if CONFIG_IOMMU_DMA is enabled.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent e31c8ea5

drivers/gpu/drm/tegra/drm.c

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>



#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)

#include <asm/dma-iommu.h>

#endif



#include "drm.h"

#include "gem.h"
@@ -1068,6 +1072,14 @@ struct iommu_group *host1x_client_iommu_attach(struct host1x_client *client, 
		}



		if (!shared || (shared && (group != tegra->group))) {

#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);

			}

#endif

			err = iommu_attach_group(tegra->domain, group);

			if (err < 0) {

				iommu_group_put(group);