summaryrefslogtreecommitdiff
path: root/drivers/memory/tegra/tegra124.c
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2020-09-01 18:32:48 +0300
committerKrzysztof Kozlowski <krzk@kernel.org>2020-09-02 18:23:59 +0300
commitea90f66f2a8629dde07328df0b8314aae5e54a47 (patch)
tree633fbe81b8a65aaa71911104f1fde2695f641a06 /drivers/memory/tegra/tegra124.c
parent25f2f5e5910fa5e805cb1232237291f2ac4e9eb0 (diff)
downloadlinux-ea90f66f2a8629dde07328df0b8314aae5e54a47.tar.xz
memory: tegra: Remove GPU from DRM IOMMU group
Commit 63a613fdb16c ("memory: tegra: Add gr2d and gr3d to DRM IOMMU group") added the GPU to the DRM IOMMU group, which doesn't make any sense. This causes problems when Nouveau tries to attach to the SMMU and causes it to fall back to using the DMA API. Remove the GPU from the DRM groups to restore the old behaviour. The GPU should always have its own IOMMU domain to make sure it can map buffers into contiguous chunks (for big page support) without getting in the way of mappings from the DRM group. Cc: <stable@vger.kernel.org> Fixes: 63a613fdb16c ("memory: tegra: Add gr2d and gr3d to DRM IOMMU group") Reported-by: Matias Zuniga <matias.nicolas.zc@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Dmitry Osipenko <digetx@gmail.com> Link: https://lore.kernel.org/r/20200901153248.1831263-1-thierry.reding@gmail.com Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'drivers/memory/tegra/tegra124.c')
-rw-r--r--drivers/memory/tegra/tegra124.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c
index 493b5dc3a4b3..0cede24479bf 100644
--- a/drivers/memory/tegra/tegra124.c
+++ b/drivers/memory/tegra/tegra124.c
@@ -957,7 +957,6 @@ static const struct tegra_smmu_swgroup tegra124_swgroups[] = {
static const unsigned int tegra124_group_drm[] = {
TEGRA_SWGROUP_DC,
TEGRA_SWGROUP_DCB,
- TEGRA_SWGROUP_GPU,
TEGRA_SWGROUP_VIC,
};