igt: Report the global GTT size

For many tests, the relevant aperture is not the ppGTT but the internal
global GTT managed by the kernel. Use this limit appropriately.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2016-02-05 18:35:21 +00:00
parent e85c530eab
commit 391b32c382
9 changed files with 39 additions and 50 deletions
+3 -3
View File
@@ -317,14 +317,14 @@ test_huge_bo(int fd, int huge, int tiling)
*/
if (tiling &&
intel_gen(intel_get_drm_devid(fd)) < 4 &&
size >= gem_aperture_size(fd) / 2)
size >= gem_global_aperture_size(fd) / 2)
size /= 2;
break;
case 0:
size = gem_mappable_aperture_size() + PAGE_SIZE;
break;
default:
size = gem_aperture_size(fd) + PAGE_SIZE;
size = gem_global_aperture_size(fd) + PAGE_SIZE;
break;
}
intel_require_memory(1, size, CHECK_RAM);
@@ -395,7 +395,7 @@ test_huge_copy(int fd, int huge, int tiling_a, int tiling_b)
huge_object_size = gem_mappable_aperture_size() + PAGE_SIZE;
break;
default:
huge_object_size = gem_aperture_size(fd) + PAGE_SIZE;
huge_object_size = gem_global_aperture_size(fd) + PAGE_SIZE;
break;
}
intel_require_memory(2, huge_object_size, CHECK_RAM);