aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2017-01-17 05:04:45 -0500
committerLucas Stach <l.stach@pengutronix.de>2017-02-02 04:30:43 -0500
commite17d0bf23f124f3e341415377a2ccbe0195f4158 (patch)
treee3e942a06c00d15752a80767586d94a923d9d983
parente66774dd6f6a3d44559599e4eeb785734c28d034 (diff)
Revert "drm/etnaviv: trick drm_mm into giving out a low IOVA"
Now that commandstreams are handled through the cmdbuf suballocator the workaround to make the IOVA games work is not needed anymore. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
-rw-r--r--drivers/gpu/drm/etnaviv/etnaviv_mmu.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
index dcc86d8eeb98..6a8c28e64866 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
@@ -117,14 +117,9 @@ static int etnaviv_iommu_find_iova(struct etnaviv_iommu *mmu,
117 struct list_head list; 117 struct list_head list;
118 bool found; 118 bool found;
119 119
120 /*
121 * XXX: The DRM_MM_SEARCH_BELOW is really a hack to trick
122 * drm_mm into giving out a low IOVA after address space
123 * rollover. This needs a proper fix.
124 */
125 ret = drm_mm_insert_node_in_range(&mmu->mm, node, 120 ret = drm_mm_insert_node_in_range(&mmu->mm, node,
126 size, 0, mmu->last_iova, ~0UL, 121 size, 0, mmu->last_iova, ~0UL,
127 mmu->last_iova ? DRM_MM_SEARCH_DEFAULT : DRM_MM_SEARCH_BELOW); 122 DRM_MM_SEARCH_DEFAULT);
128 123
129 if (ret != -ENOSPC) 124 if (ret != -ENOSPC)
130 break; 125 break;