tests/gem_mmap_gtt: Deal with tile sizes on gen2/3

Gen2/3 platforms have some unusual tile dimensions. Account
for them to make the test work correctly.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä 2015-12-13 06:53:28 +02:00
parent 1ecd91a8c6
commit 86382de3fb

View File

@ -330,6 +330,18 @@ test_coherency(int fd)
gem_close(fd, handle); gem_close(fd, handle);
} }
static int tile_width(uint32_t devid, int tiling)
{
if (intel_gen(devid) == 2)
return 128;
else if (tiling == I915_TILING_X)
return 512;
else if (IS_915(devid))
return 512;
else
return 128;
}
static void static void
test_huge_bo(int fd, int huge, int tiling) test_huge_bo(int fd, int huge, int tiling)
{ {
@ -338,7 +350,8 @@ test_huge_bo(int fd, int huge, int tiling)
char *tiled_pattern; char *tiled_pattern;
char *linear_pattern; char *linear_pattern;
uint64_t size, last_offset; uint64_t size, last_offset;
int pitch = tiling == I915_TILING_Y ? 128 : 512; uint32_t devid = intel_get_drm_devid(fd);
int pitch = tile_width(devid, tiling);
int i; int i;
switch (huge) { switch (huge) {
@ -404,6 +417,7 @@ test_huge_bo(int fd, int huge, int tiling)
static void static void
test_huge_copy(int fd, int huge, int tiling_a, int tiling_b) test_huge_copy(int fd, int huge, int tiling_a, int tiling_b)
{ {
uint32_t devid = intel_get_drm_devid(fd);
uint64_t huge_object_size, i; uint64_t huge_object_size, i;
uint32_t bo, *pattern_a, *pattern_b; uint32_t bo, *pattern_a, *pattern_b;
char *a, *b; char *a, *b;
@ -434,7 +448,7 @@ test_huge_copy(int fd, int huge, int tiling_a, int tiling_b)
bo = gem_create(fd, huge_object_size); bo = gem_create(fd, huge_object_size);
if (tiling_a) if (tiling_a)
igt_require(__gem_set_tiling(fd, bo, tiling_a, tiling_a == I915_TILING_Y ? 128 : 512) == 0); igt_require(__gem_set_tiling(fd, bo, tiling_a, tile_width(devid, tiling_a)) == 0);
a = __gem_mmap__gtt(fd, bo, huge_object_size, PROT_READ | PROT_WRITE); a = __gem_mmap__gtt(fd, bo, huge_object_size, PROT_READ | PROT_WRITE);
igt_require(a); igt_require(a);
gem_close(fd, bo); gem_close(fd, bo);
@ -444,7 +458,7 @@ test_huge_copy(int fd, int huge, int tiling_a, int tiling_b)
bo = gem_create(fd, huge_object_size); bo = gem_create(fd, huge_object_size);
if (tiling_b) if (tiling_b)
igt_require(__gem_set_tiling(fd, bo, tiling_b, tiling_b == I915_TILING_Y ? 128 : 512) == 0); igt_require(__gem_set_tiling(fd, bo, tiling_b, tile_width(devid, tiling_b)) == 0);
b = __gem_mmap__gtt(fd, bo, huge_object_size, PROT_READ | PROT_WRITE); b = __gem_mmap__gtt(fd, bo, huge_object_size, PROT_READ | PROT_WRITE);
igt_require(b); igt_require(b);
gem_close(fd, bo); gem_close(fd, bo);