From patchwork Wed Feb 3 21:41:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 8209321 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0EA6F9FBE9 for ; Wed, 3 Feb 2016 21:41:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EFF72027D for ; Wed, 3 Feb 2016 21:41:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 939112022D for ; Wed, 3 Feb 2016 21:41:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 643D86E3E2; Wed, 3 Feb 2016 13:41:47 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 062936E3E2; Wed, 3 Feb 2016 13:41:45 -0800 (PST) Received: from eliezer.anholt.net (annarchy.freedesktop.org [127.0.0.1]) by annarchy.freedesktop.org (Postfix) with ESMTP id E26EC181E8; Wed, 3 Feb 2016 13:41:44 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 77414F1B136; Wed, 3 Feb 2016 13:41:43 -0800 (PST) From: Eric Anholt To: intel-gfx@lists.freedesktop.org Date: Wed, 3 Feb 2016 13:41:42 -0800 Message-Id: <1454535703-660-8-git-send-email-eric@anholt.net> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454535703-660-1-git-send-email-eric@anholt.net> References: <1454535703-660-1-git-send-email-eric@anholt.net> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH igt 8/9] igt/vc4_create_bo: Test various paths in BO creation. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, 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 create-bo-0 fails on the current kernel, and it's something I want to fix. Signed-off-by: Eric Anholt --- tests/Makefile.am | 2 ++ tests/Makefile.sources | 1 + tests/vc4_create_bo.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 tests/vc4_create_bo.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 791564d..f72f7c0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -101,6 +101,8 @@ prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) +vc4_create_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) +vc4_create_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS) vc4_wait_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) vc4_wait_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS) vc4_wait_seqno_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 49dd61e..df92586 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -5,6 +5,7 @@ NOUVEAU_TESTS_M = \ $(NULL) VC4_TESTS_M = \ + vc4_create_bo \ vc4_wait_bo \ vc4_wait_seqno \ $(NULL) diff --git a/tests/vc4_create_bo.c b/tests/vc4_create_bo.c new file mode 100644 index 0000000..d5a914f --- /dev/null +++ b/tests/vc4_create_bo.c @@ -0,0 +1,91 @@ +/* + * Copyright © 2016 Broadcom + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "igt.h" +#include "igt_vc4.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "vc4_drm.h" + +igt_main +{ + int ret; + int fd; + + igt_fixture { + fd = drm_open_driver(DRIVER_VC4); + } + + igt_subtest("create-bo-4096") { + int handle = igt_vc4_create_bo(fd, 4096); + gem_close(fd, handle); + } + + igt_subtest("create-bo-0") { + struct drm_vc4_create_bo arg = { + .size = 0, + }; + ret = ioctl(fd, DRM_IOCTL_VC4_CREATE_BO, &arg); + igt_assert(ret == -1 && errno == EINVAL); + } + + igt_subtest("create-bo-zeroed") { + int fd2 = drm_open_driver(DRIVER_VC4); + int handle; + uint32_t *map; + /* A size different from any used in our other tests, to try + * to convince it to land as the only one of its size in the + * kernel BO cache + */ + size_t size = 3 * 4096, i; + + /* Make a BO and free it on our main fd. */ + handle = igt_vc4_create_bo(fd, size); + map = igt_vc4_mmap_bo(fd, handle, size, PROT_READ | PROT_WRITE); + memset(map, 0xd0, size); + munmap(map, size); + gem_close(fd, handle); + + /* Now, allocate a BO on the other fd and make sure it doesn't + * have the old contents. + */ + handle = igt_vc4_create_bo(fd2, size); + map = igt_vc4_mmap_bo(fd2, handle, size, PROT_READ | PROT_WRITE); + for (i = 0; i < size / 4; i++) + igt_assert_eq_u32(map[i], 0x0); + munmap(map, size); + gem_close(fd2, handle); + + close(fd2); + } + + igt_fixture + close(fd); +}