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

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

drm/nouveau/ttm: evict other IO mappings when running out of BAR1 space
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Ben Skeggs
1 parent 0e7e6198af
Showing 1 changed file with 7 additions and 2 deletions Side-by-side Diff
drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1494,8 +1494,13 @@
 			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;
...	...	@@ -1494,8 +1494,13 @@
1494	1494	ret = nvif_object_map_handle(&mem->mem.object,
1495	1495	&args, argc,
1496	1496	&handle, &length);
1497		- if (ret != 1)
1498		- return ret ? ret : -EINVAL;
	1497	+ if (ret != 1) {
	1498	+ if (WARN_ON(ret == 0))
	1499	+ return -EINVAL;
	1500	+ if (ret == -ENOSPC)
	1501	+ return -EAGAIN;
	1502	+ return ret;
	1503	+ }
1499	1504
1500	1505	reg->bus.base = 0;
1501	1506	reg->bus.offset = handle;