From patchwork Tue Mar 8 14:51:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8534981 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 299F69F2B4 for ; Tue, 8 Mar 2016 14:52:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3521C200D0 for ; Tue, 8 Mar 2016 14:52:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A3E75200E7 for ; Tue, 8 Mar 2016 14:52:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1EB26E6FC; Tue, 8 Mar 2016 14:52:24 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id EA9966E6F9 for ; Tue, 8 Mar 2016 14:52:16 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n186so4560336wmn.0 for ; Tue, 08 Mar 2016 06:52:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4TycHh6xPI3RFmo87MgFr3s1of2CTRbLog+SG3l+cJA=; b=QwG3y1HmxHdrdt29wDD/8juiu2i8naL0eDFpqM8dYJbULGqNMWQi6ZrtSz+JaUD7VY 0piCoH+io3L9iMxG/XBXGVop/GYuXbjEf4ES+9fcAO1dvqXf/YP7GfgFTYZI1quaE4ZQ /PPHPuDrQLDct9kZNU3IeRec8mgoweR3V2oSkHAG1wqvWQulTGy0tyNHav5jXXn/wztN ISGHy1beZTFUgu/dxEMuehf7D5DvqQN7bOd5o8dtwspCpDfyAq2G5OlYPh1RSJfQ/bM3 Ni/FdF4cIj1TCAZlLe0kP0mAlQQBMcvH6sutgMap4BH6h/vQ9Hvml6bjAzq4sxOxqm3/ LXPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=4TycHh6xPI3RFmo87MgFr3s1of2CTRbLog+SG3l+cJA=; b=ia1k9wozQdC3vlhWyutbfJnAZBWYRTKH6uca+Gz6zemHjSdQaACy4JW7Tjo0ducKaW KoN9u/IBnhspLvQKqGDBp/rCVIOdsEGInlS6H5TjjArczl/gIfe2Itn4ZrM22YmlNb3R fKE0LR+IOdEdsTgnFhLU0o07ldx+o8D+X6m5XvrcQtw2e1LDhEvfSO4hky/kbAZqmXbj FL4/qpTwhNc+rpNi+f5s87nJg/eIx1D7GEDV1r5bwfpYht8vbycQdr9lLF4znizQzHFp IQyqV4tUkTeXh0JPcyKFerrh0NiilDAtFuPgRJ+6vcFWWTRgfU8ouBjiVD4xe9R15lzi FkVA== X-Gm-Message-State: AD7BkJJBUGqvSrdvQAlL8PCs2oQioYXH3ThlTHMIzHBxuT94hlbI5FCbm2LVKuAy9KwmvQ== X-Received: by 10.194.121.34 with SMTP id lh2mr29259426wjb.145.1457448735097; Tue, 08 Mar 2016 06:52:15 -0800 (PST) Received: from cizrna.lan ([109.72.12.208]) by smtp.gmail.com with ESMTPSA id 3sm3781979wmp.14.2016.03.08.06.52.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2016 06:52:14 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Tue, 8 Mar 2016 15:51:29 +0100 Message-Id: <1457448699-9778-8-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> References: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Daniel Stone , Tomeu Vizoso , Micah Fedke , Gustavo Padovan , Emil Velikov Subject: [Intel-gfx] [i-g-t PATCH v2 07/17] lib: Add wrapper for DRM_IOCTL_MODE_CREATE_DUMB 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 In order to test drivers that don't have support for proper buffer objects, add a wrapper for creating dumb buffer objects that will be called from the lib code for those subtests that don't need to care. Signed-off-by: Tomeu Vizoso --- Changes in v2: - Rename dumb_create to kmstest_dumb_create as suggested by Daniel Vetter. lib/igt_kms.c | 36 ++++++++++++++++++++++++++++++++++++ lib/igt_kms.h | 3 +++ tests/drm_read.c | 16 +--------------- tests/gem_exec_blt.c | 18 +----------------- 4 files changed, 41 insertions(+), 32 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 5a61def98290..ee375bffc5e2 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -309,6 +309,42 @@ uint32_t kmstest_find_crtc_for_connector(int fd, drmModeRes *res, igt_assert(false); } +/** + * kmstest_dumb_create: + * @fd: open drm file descriptor + * @width: width of the buffer in pixels + * @height: height of the buffer in pixels + * @bpp: bytes per pixel of the buffer + * + * This wraps the CREATE_DUMB ioctl, which allocates a new dumb buffer object + * for the specified dimensions. + * + * Returns: The file-private handle of the created buffer object + */ +uint32_t kmstest_dumb_create(int fd, int width, int height, int bpp, + unsigned *stride, unsigned *size) +{ + struct drm_mode_create_dumb create; + + memset(&create, 0, sizeof(create)); + create.width = width; + create.height = height; + create.bpp = bpp; + + create.handle = 0; + do_ioctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &create); + igt_assert(create.handle); + igt_assert(create.size >= width * height * bpp / 8); + + if (stride) + *stride = create.pitch; + + if (size) + *size = create.size; + + return create.handle; +} + /* * Returns: the previous mode, or KD_GRAPHICS if no /dev/tty0 was * found and nothing was done. diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 5744ed005c23..45df8b556daf 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -155,6 +155,9 @@ uint32_t kmstest_find_crtc_for_connector(int fd, drmModeRes *res, drmModeConnector *connector, uint32_t crtc_blacklist_idx_mask); +uint32_t kmstest_dumb_create(int fd, int width, int height, int bpp, + unsigned *stride, unsigned *size); + /* * A small modeset API */ diff --git a/tests/drm_read.c b/tests/drm_read.c index faa3df862ea6..d69c7a0a903d 100644 --- a/tests/drm_read.c +++ b/tests/drm_read.c @@ -120,20 +120,6 @@ static void test_invalid_buffer(int in) teardown(fd); } -static uint32_t dumb_create(int fd) -{ - struct drm_mode_create_dumb arg; - - arg.bpp = 32; - arg.width = 32; - arg.height = 32; - - do_ioctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg); - igt_assert(arg.size >= 4096); - - return arg.handle; -} - static void test_fault_buffer(int in) { int fd = setup(in, 0); @@ -141,7 +127,7 @@ static void test_fault_buffer(int in) char *buf; memset(&arg, 0, sizeof(arg)); - arg.handle = dumb_create(fd); + arg.handle = kmstest_dumb_create(fd, 32, 32, 32, NULL, NULL); do_ioctl(fd, DRM_IOCTL_MODE_MAP_DUMB, &arg); diff --git a/tests/gem_exec_blt.c b/tests/gem_exec_blt.c index 74f5c2ba87ad..677708de850c 100644 --- a/tests/gem_exec_blt.c +++ b/tests/gem_exec_blt.c @@ -170,22 +170,6 @@ static const char *bytes_per_sec(char *buf, double v) return buf; } -static uint32_t dumb_create(int fd) -{ - struct drm_mode_create_dumb arg; - int ret; - - arg.bpp = 32; - arg.width = 32; - arg.height = 32; - - ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg); - igt_assert_eq(ret, 0); - igt_assert(arg.size >= 4096); - - return arg.handle; -} - static int dcmp(const void *A, const void *B) { const double *a = A, *b = B; @@ -209,7 +193,7 @@ static void run(int object_size, bool dumb) fd = drm_open_driver(DRIVER_INTEL); if (dumb) - handle = dumb_create(fd); + handle = kmstest_dumb_create(fd, 32, 32, 32, NULL, NULL); else handle = gem_create(fd, 4096);