From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Date: Tue, 22 Jul 2014 11:33:49 +0000 (+0100)
Subject: igt/gem_userptr_blits: Fix forked access test
X-Git-Tag: intel-gpu-tools-1.8~129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=700bdf1401f1596d25024fd1038e782708bf39e5;p=platform%2Fupstream%2Fintel-gpu-tools.git

igt/gem_userptr_blits: Fix forked access test

copy() blit helper assumes a certain object size much larger than a page size.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/tests/gem_userptr_blits.c b/tests/gem_userptr_blits.c
index 2a52856..3d045a7 100644
--- a/tests/gem_userptr_blits.c
+++ b/tests/gem_userptr_blits.c
@@ -589,22 +589,22 @@ static void test_forked_access(int fd)
 	void *ptr1 = NULL, *ptr2 = NULL;
 	int ret;
 
-	ret = posix_memalign(&ptr1, PAGE_SIZE, PAGE_SIZE);
-	ret |= madvise(ptr1, PAGE_SIZE, MADV_DONTFORK);
-	ret |= gem_userptr(fd, ptr1, PAGE_SIZE, 0, &handle1);
+	ret = posix_memalign(&ptr1, PAGE_SIZE, sizeof(linear));
+	ret |= madvise(ptr1, sizeof(linear), MADV_DONTFORK);
+	ret |= gem_userptr(fd, ptr1, sizeof(linear), 0, &handle1);
 	igt_assert(ret == 0);
 	igt_assert(ptr1);
 	igt_assert(handle1);
 
-	ret = posix_memalign(&ptr2, PAGE_SIZE, PAGE_SIZE);
-	ret |= madvise(ptr2, PAGE_SIZE, MADV_DONTFORK);
-	ret |= gem_userptr(fd, ptr2, PAGE_SIZE, 0, &handle2);
+	ret = posix_memalign(&ptr2, PAGE_SIZE, sizeof(linear));
+	ret |= madvise(ptr2, sizeof(linear), MADV_DONTFORK);
+	ret |= gem_userptr(fd, ptr2, sizeof(linear), 0, &handle2);
 	igt_assert(ret == 0);
 	igt_assert(ptr2);
 	igt_assert(handle2);
 
-	memset(ptr1, 0x1, PAGE_SIZE);
-	memset(ptr2, 0x2, PAGE_SIZE);
+	memset(ptr1, 0x1, sizeof(linear));
+	memset(ptr2, 0x2, sizeof(linear));
 
 	igt_fork(child, 1) {
 		copy(fd, handle1, handle2, 0);
@@ -617,13 +617,13 @@ static void test_forked_access(int fd)
 	gem_close(fd, handle1);
 	gem_close(fd, handle2);
 
-	igt_assert(memcmp(ptr1, ptr2, PAGE_SIZE) == 0);
+	igt_assert(memcmp(ptr1, ptr2, sizeof(linear)) == 0);
 
-	ret = madvise(ptr1, PAGE_SIZE, MADV_DOFORK);
+	ret = madvise(ptr1, sizeof(linear), MADV_DOFORK);
 	igt_assert(ret == 0);
 	free(ptr1);
 
-	ret = madvise(ptr2, PAGE_SIZE, MADV_DOFORK);
+	ret = madvise(ptr2, sizeof(linear), MADV_DOFORK);
 	igt_assert(ret == 0);
 	free(ptr2);
 }