diff mbox

igt/gem_userptr_blits: Fix forked access test

Message ID 1406028829-30897-1-git-send-email-tvrtko.ursulin@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tvrtko Ursulin July 22, 2014, 11:33 a.m. UTC 
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>
---
 tests/gem_userptr_blits.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Comments

Chris Wilson July 23, 2014, 12:19 p.m. UTC | #1 
On Tue, Jul 22, 2014 at 12:33:49PM +0100, Tvrtko Ursulin wrote:
> 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>
-Chris
diff mbox

Patch

diff --git a/tests/gem_userptr_blits.c b/tests/gem_userptr_blits.c
index 3277096..5413409 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);
 }