From patchwork Tue Jul 22 11:33:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 4601511 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 42161C0514 for ; Tue, 22 Jul 2014 11:34:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76B36200FE for ; Tue, 22 Jul 2014 11:34:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 66489200EC for ; Tue, 22 Jul 2014 11:34:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5706A6E295; Tue, 22 Jul 2014 04:34:16 -0700 (PDT) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 22B706E295 for ; Tue, 22 Jul 2014 04:34:15 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 22 Jul 2014 04:34:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,710,1400050800"; d="scan'208";a="573570186" Received: from tursulin-linux.iwi.intel.com ([172.28.253.62]) by fmsmga002.fm.intel.com with ESMTP; 22 Jul 2014 04:33:54 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 22 Jul 2014 12:33:49 +0100 Message-Id: <1406028829-30897-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 1.9.3 Subject: [Intel-gfx] [PATCH] igt/gem_userptr_blits: Fix forked access test X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP copy() blit helper assumes a certain object size much larger than a page size. Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson Reviewed-by: Chris Wilson --- tests/gem_userptr_blits.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) 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); }