From patchwork Wed Feb 3 21:41:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 8209341 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 9C3839F38B 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 998B0202D1 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 85DB6202BE for ; Wed, 3 Feb 2016 21:41:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 095556E7AA; Wed, 3 Feb 2016 13:41:49 -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 49BEC6E425; Wed, 3 Feb 2016 13:41:44 -0800 (PST) Received: from eliezer.anholt.net (annarchy.freedesktop.org [127.0.0.1]) by annarchy.freedesktop.org (Postfix) with ESMTP id 34310181E8; Wed, 3 Feb 2016 13:41:44 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 4550BF0012A; 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:39 -0800 Message-Id: <1454535703-660-5-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 5/9] igt: Add a helper function for getting a VC4 BO that's been drawn to. 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 Signed-off-by: Eric Anholt --- lib/Makefile.sources | 2 + lib/igt_vc4.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/igt_vc4.h | 29 ++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 lib/igt_vc4.c create mode 100644 lib/igt_vc4.h diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 4999868..8a8143f 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -16,6 +16,8 @@ libintel_tools_la_SOURCES = \ igt_gt.h \ igt_stats.c \ igt_stats.h \ + igt_vc4.c \ + igt_vc4.h \ instdone.c \ instdone.h \ intel_batchbuffer.c \ diff --git a/lib/igt_vc4.c b/lib/igt_vc4.c new file mode 100644 index 0000000..62e1345 --- /dev/null +++ b/lib/igt_vc4.c @@ -0,0 +1,106 @@ +/* + * 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 +#include +#include +#include +#include +#include +#include +#include + +#include "drmtest.h" +#include "igt_aux.h" +#include "igt_core.h" +#include "igt_vc4.h" +#include "ioctl_wrappers.h" +#include "intel_reg.h" +#include "intel_chipset.h" +#include "vc4_drm.h" +#include "vc4_packet.h" + +#if NEW_CONTEXT_PARAM_NO_ERROR_CAPTURE_API +#define LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4 +#endif + +/** + * SECTION:igt_vc4 + * @short_description: VC4 support library + * @title: VC4 + * @include: igt.h + * + * This library provides various auxiliary helper functions for writing VC4 + * tests. + */ + +/** + * igt_vc4_get_cleared_bo: + * @size: size of the BO in bytes + * @clearval: u32 value that the buffer should be completely cleared with + * + * This helper returns a new BO with the given size, which has just been + * cleared using the render engine. + */ +uint32_t igt_vc4_get_cleared_bo(int fd, size_t size, uint32_t clearval) +{ + /* A single row will be a page. */ + uint32_t width = 1024; + uint32_t height = size / (width * 4); + struct drm_vc4_create_bo create = { + .size = size, + }; + struct drm_vc4_submit_cl submit = { + .color_write = { + .hindex = 0, + .bits = VC4_SET_FIELD(VC4_RENDER_CONFIG_FORMAT_RGBA8888, + VC4_RENDER_CONFIG_FORMAT), + }, + + .color_read = { .hindex = ~0 }, + .zs_read = { .hindex = ~0 }, + .zs_write = { .hindex = ~0 }, + .msaa_color_write = { .hindex = ~0 }, + .msaa_zs_write = { .hindex = ~0 }, + + .bo_handles = (uint64_t)(uintptr_t)&create.handle, + .bo_handle_count = 1, + .width = width, + .height = height, + .max_x_tile = ALIGN(width, 64) / 64 - 1, + .max_y_tile = ALIGN(height, 64) / 64 - 1, + .clear_color = { clearval, clearval }, + .flags = VC4_SUBMIT_CL_USE_CLEAR_COLOR, + }; + int ret; + + igt_assert(width * height * 4 == size); + + ret = ioctl(fd, DRM_IOCTL_VC4_CREATE_BO, &create); + igt_assert(ret == 0); + + ret = ioctl(fd, DRM_IOCTL_VC4_SUBMIT_CL, &submit); + igt_assert(ret == 0); + + return create.handle; +} diff --git a/lib/igt_vc4.h b/lib/igt_vc4.h new file mode 100644 index 0000000..4622034 --- /dev/null +++ b/lib/igt_vc4.h @@ -0,0 +1,29 @@ +/* + * 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. + */ + +#ifndef IGT_VC4_H +#define IGT_VC4_H + +uint32_t igt_vc4_get_cleared_bo(int fd, size_t size, uint32_t clearval); + +#endif /* IGT_VC4_H */