From patchwork Tue Mar 8 14:51:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8534991 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 56E719F2B4 for ; Tue, 8 Mar 2016 14:52:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3116C201EF for ; Tue, 8 Mar 2016 14:52:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 19F30201C8 for ; Tue, 8 Mar 2016 14:52:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C6206E016; Tue, 8 Mar 2016 14:52:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id ECC986E6EE for ; Tue, 8 Mar 2016 14:52:37 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id 1so4547961wmg.2 for ; Tue, 08 Mar 2016 06:52:37 -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=VDl9C7fy3/p46UrF7VjXbLwR0MysJztn+RA26bdvp9M=; b=Xj+2Un47iaDJL/gtFYH38kMfoSkpsmaYCrz+WfS+MTLk7eOxZgnjWRJ+TbMv6z2u4v Z1jwACXg2EyqHgL9mz1enuia/rkpjukpJdMQD/FlE8vq2EDZkefRDZntwEGeGw9ilPR8 rMm7R2M0b03tWTcAtT1iEGxBDR7BQCLAZFf8was7+i4zRxsqTNzbIy7TwV1z8iiuCfEz x9XG6zaX4R6Dr4SnDJyxGYUGjq7TEA3maMLOMU7yqMDZKULU2AJgXio/hNxzjgnAXUwY 6x+lNLQuAmebQNAPXSRFkG+I3Z3vZ4ANk1E7wxBYMuAhp0cjzRrr5kwtws7V9yCZv/jP px6g== 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=VDl9C7fy3/p46UrF7VjXbLwR0MysJztn+RA26bdvp9M=; b=HwfaveMN4pP7mN5r2gqm9fy3o2wKV26r1uaPl+L8v8FRihFNefqj9jumLkS8lQixq1 4nF3pfTPKcsvWjQrrvEm74qVh0AzUBt+/WXMSD294ZIX+KKSQBwy0MZ4Le0duGzjR1MQ 5dVRvGwAsiI90ptLimeCoCQ4mc9WmxQMlhMJqwDoi/7t7w1SM2Kn6NYQ9DaBS2SGRdGh ZuCEdDTPn0dEEXAVulrxdJMRipSC4XJGSIEpvZ9RabMC5AGvIl2TEIuZvSGcWvldpKSA AfxcPOHbfBaRVYhi3s6IHCr+5FdMVAEg/fpM0ckL4rk31US4Qhy4p8MG88Gw7itg6cM8 /Tiw== X-Gm-Message-State: AD7BkJL6S0X22hElYlUXmcoe/CHFrMnzr/F85NAKLggWo4b25JfNsNhmi86wAdrRTI0fTw== X-Received: by 10.194.121.34 with SMTP id lh2mr29261216wjb.145.1457448756236; Tue, 08 Mar 2016 06:52:36 -0800 (PST) Received: from cizrna.lan ([109.72.12.208]) by smtp.gmail.com with ESMTPSA id 3sm3781979wmp.14.2016.03.08.06.52.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2016 06:52:35 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Tue, 8 Mar 2016 15:51:33 +0100 Message-Id: <1457448699-9778-12-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 11/17] lib: Add igt_create_bo_with_dimensions 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 igt_create_bo_with_dimensions() is intended to abstract differences between drivers in buffer object creation. The driver-specific ioctls will be called if the driver that is being tested can satisfy the needs of the calling subtest, or it will be skipped otherwise. Signed-off-by: Tomeu Vizoso --- Changes in v2: - Call kmstest_dumb_create instead of dumb_create from igt_create_bo_with_dimensions. - Add missing gtkdoc to igt_create_bo_with_dimensions. - Try to use GEM API when a stride is passed lib/igt_fb.c | 102 +++++++++++++++++++++++++++++++++++++++++++++-------------- lib/igt_fb.h | 6 ++++ 2 files changed, 84 insertions(+), 24 deletions(-) diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 361f94627659..c4c518bdb777 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -31,6 +31,7 @@ #include "drmtest.h" #include "igt_fb.h" +#include "igt_kms.h" #include "ioctl_wrappers.h" #include "intel_chipset.h" @@ -178,30 +179,84 @@ void igt_calc_fb_size(int fd, int width, int height, int bpp, uint64_t tiling, *size_ret = size; } +/** + * igt_create_bo_with_dimensions: + * @fd: open drm file descriptor + * @width: width of the buffer object in pixels + * @height: height of the buffer object in pixels + * @format: drm fourcc pixel format code + * @modifier: modifier corresponding to the tiling layout of the buffer object + * @stride: stride of the buffer object in bytes (0 for automatic stride) + * @size_ret: size of the buffer object as created by the kernel + * @stride_ret: stride of the buffer object as created by the kernel + * @is_dumb: whether the created buffer object is a dumb buffer or not + * + * This function allocates a gem buffer object matching the requested + * properties. + * + * Returns: + * The kms id of the created buffer object. + */ +int igt_create_bo_with_dimensions(int fd, int width, int height, + uint32_t format, uint64_t modifier, + unsigned stride, unsigned *size_ret, + unsigned *stride_ret, bool *is_dumb) +{ + int bpp = igt_drm_format_to_bpp(format); + int bo; + + if (modifier || stride) { + unsigned size, calculated_stride; + + igt_calc_fb_size(fd, width, height, bpp, modifier, &size, + &calculated_stride); + if (stride == 0) + stride = calculated_stride; + + if (is_dumb) + *is_dumb = false; + + if (is_i915_device(fd)) { + + bo = gem_create(fd, size); + gem_set_tiling(fd, bo, modifier, stride); + + if (size_ret) + *size_ret = size; + + if (stride_ret) + *stride_ret = stride; + + return bo; + } else { + bool driver_has_tiling_support = false; + + igt_require(driver_has_tiling_support); + return -EINVAL; + } + } else { + if (is_dumb) + *is_dumb = true; + + return kmstest_dumb_create(fd, width, height, bpp, stride_ret, + size_ret); + } +} + /* helpers to create nice-looking framebuffers */ -static int create_bo_for_fb(int fd, int width, int height, int bpp, +static int create_bo_for_fb(int fd, int width, int height, uint32_t format, uint64_t tiling, unsigned bo_size, unsigned bo_stride, uint32_t *gem_handle_ret, - unsigned *size_ret, unsigned *stride_ret) + unsigned *size_ret, unsigned *stride_ret, + bool *is_dumb) { uint32_t gem_handle; int ret = 0; - unsigned size, stride; - - igt_calc_fb_size(fd, width, height, bpp, tiling, &size, &stride); - if (bo_size == 0) - bo_size = size; - if (bo_stride == 0) - bo_stride = stride; - gem_handle = gem_create(fd, bo_size); + gem_handle = igt_create_bo_with_dimensions(fd, width, height, format, + tiling, bo_stride, size_ret, + stride_ret, is_dumb); - if (tiling == LOCAL_I915_FORMAT_MOD_X_TILED) - ret = __gem_set_tiling(fd, gem_handle, I915_TILING_X, - bo_stride); - - *stride_ret = bo_stride; - *size_ret = bo_size; *gem_handle_ret = gem_handle; return ret; @@ -505,17 +560,14 @@ igt_create_fb_with_bo_size(int fd, int width, int height, unsigned bo_stride) { uint32_t fb_id; - int bpp; memset(fb, 0, sizeof(*fb)); - bpp = igt_drm_format_to_bpp(format); - - igt_debug("%s(width=%d, height=%d, format=0x%x [bpp=%d], tiling=0x%"PRIx64", size=%d)\n", - __func__, width, height, format, bpp, tiling, bo_size); - do_or_die(create_bo_for_fb(fd, width, height, bpp, tiling, bo_size, + igt_debug("%s(width=%d, height=%d, format=0x%x, tiling=0x%"PRIx64", size=%d)\n", + __func__, width, height, format, tiling, bo_size); + do_or_die(create_bo_for_fb(fd, width, height, format, tiling, bo_size, bo_stride, &fb->gem_handle, &fb->size, - &fb->stride)); + &fb->stride, &fb->is_dumb)); igt_debug("%s(handle=%d, pitch=%d)\n", __func__, fb->gem_handle, fb->stride); @@ -865,6 +917,7 @@ struct fb_blit_upload { uint32_t handle; unsigned size, stride; uint8_t *map; + bool is_dumb; } linear; }; @@ -933,7 +986,8 @@ static void create_cairo_surface__blit(int fd, struct igt_fb *fb) LOCAL_DRM_FORMAT_MOD_NONE, 0, 0, &blit->linear.handle, &blit->linear.size, - &blit->linear.stride); + &blit->linear.stride, + &blit->linear.is_dumb); igt_assert(ret == 0); diff --git a/lib/igt_fb.h b/lib/igt_fb.h index 91e91408b340..83217b5521fd 100644 --- a/lib/igt_fb.h +++ b/lib/igt_fb.h @@ -48,6 +48,7 @@ struct igt_fb { uint32_t fb_id; int fd; uint32_t gem_handle; + bool is_dumb; uint32_t drm_format; int width; int height; @@ -100,6 +101,11 @@ unsigned int igt_create_stereo_fb(int drm_fd, drmModeModeInfo *mode, void igt_remove_fb(int fd, struct igt_fb *fb); int igt_dirty_fb(int fd, struct igt_fb *fb); +int igt_create_bo_with_dimensions(int fd, int width, int height, uint32_t format, + uint64_t modifier, unsigned stride, + unsigned *stride_out, unsigned *size_out, + bool *is_dumb); + /* cairo-based painting */ cairo_t *igt_get_cairo_ctx(int fd, struct igt_fb *fb); void igt_paint_color(cairo_t *cr, int x, int y, int w, int h,