drm/nouveau/ttm: evict other IO mappings when running out of BAR1 space

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 2b4b21b02e403201caca2fadf53c724af800f087..c40f127de3d0b2df22b6d83de7d70155899dc464 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1494,8 +1494,13 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)
                        ret = nvif_object_map_handle(&mem->mem.object,
                                                     &args, argc,
                                                     &handle, &length);
-                       if (ret != 1)
-                               return ret ? ret : -EINVAL;
+                       if (ret != 1) {
+                               if (WARN_ON(ret == 0))
+                                       return -EINVAL;
+                               if (ret == -ENOSPC)
+                                       return -EAGAIN;
+                               return ret;
+                       }
 
                        reg->bus.base = 0;
                        reg->bus.offset = handle;