1 files changed, 18 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 00520f27bea6..f698006fe883 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2361,10 +2361,24 @@ void i915_gem_suspend_gtt_mappings(struct drm_i915_private *dev_priv)
 int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
                                struct sg_table *pages)
 {
-        if (dma_map_sg(&obj->base.dev->pdev->dev,
-                       pages->sgl, pages->nents,
-                       PCI_DMA_BIDIRECTIONAL))
-                return 0;
+        do {
+                if (dma_map_sg(&obj->base.dev->pdev->dev,
+                               pages->sgl, pages->nents,
+                               PCI_DMA_BIDIRECTIONAL))
+                        return 0;
+
+                /* If the DMA remap fails, one cause can be that we have
+                 * too many objects pinned in a small remapping table,
+                 * such as swiotlb. Incrementally purge all other objects and
+                 * try again - if there are no more pages to remove from
+                 * the DMA remapper, i915_gem_shrink will return 0.
+                 */
+                GEM_BUG_ON(obj->mm.pages == pages);
+        } while (i915_gem_shrink(to_i915(obj->base.dev),
+                                 obj->base.size >> PAGE_SHIFT,
+                                 I915_SHRINK_BOUND |
+                                 I915_SHRINK_UNBOUND |
+                                 I915_SHRINK_ACTIVE));
 
         return -ENOSPC;
 }