From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD5BEC433B4 for ; Wed, 19 May 2021 14:54:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F7ED61040 for ; Wed, 19 May 2021 14:54:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F7ED61040 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA9B36EDE3; Wed, 19 May 2021 14:54:08 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22B786EDEE; Wed, 19 May 2021 14:54:05 +0000 (UTC) IronPort-SDR: IlJK1zZIU2GUM4Io/0TU6GzWnsmz/xveJ0/XWxo3KABbuXvTTLggk+zluH0ly0NHtmR4RgYsox oFyTQ60zSO/g== X-IronPort-AV: E=McAfee;i="6200,9189,9988"; a="188401216" X-IronPort-AV: E=Sophos;i="5.82,313,1613462400"; d="scan'208";a="188401216" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2021 07:54:04 -0700 IronPort-SDR: cPqqTsxD0n77HevxrwWh3OXrG8ljtI4RZsNhgclbtC5AbrZev/N7h6dIZN/Xix61sn9voB2JNQ KB7srPwvqhAg== X-IronPort-AV: E=Sophos;i="5.82,313,1613462400"; d="scan'208";a="473527457" Received: from ajwalton-mobl1.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.22.65]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2021 07:54:02 -0700 From: Matthew Auld To: igt-dev@lists.freedesktop.org Date: Wed, 19 May 2021 15:53:35 +0100 Message-Id: <20210519145337.255167-8-matthew.auld@intel.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519145337.255167-1-matthew.auld@intel.com> References: <20210519145337.255167-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 7/9] tests/i915/gem_media_fill: Use memory region interface X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.hellstrom@linux.intel.com, Dominik Grzegorzek , intel-gfx@lists.freedesktop.org, Andrzej Turko Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Andrzej Turko Converted the test gem_media_fill to use memory region uapi. Signed-off-by: Andrzej Turko Cc: Zbigniew Kempczynski Cc: Dominik Grzegorzek Cc: Petri Latvala Signed-off-by: Matthew Auld --- tests/i915/gem_media_fill.c | 57 ++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/tests/i915/gem_media_fill.c b/tests/i915/gem_media_fill.c index 24d17fab..28c18e79 100644 --- a/tests/i915/gem_media_fill.c +++ b/tests/i915/gem_media_fill.c @@ -64,21 +64,24 @@ typedef struct { } data_t; static struct intel_buf * -create_buf(data_t *data, int width, int height, uint8_t color) +create_buf(data_t *data, int width, int height, uint8_t color, uint32_t region) { struct intel_buf *buf; + uint32_t handle; uint8_t *ptr; int i; buf = calloc(1, sizeof(*buf)); igt_assert(buf); + handle = gem_create_in_memory_regions(data->drm_fd, SIZE, region); + /* * Legacy code uses 32 bpp after buffer creation. * Let's do the same due to keep shader intact. */ - intel_buf_init(data->bops, buf, width/4, height, 32, 0, - I915_TILING_NONE, 0); + intel_buf_init_using_handle(data->bops, handle, buf, width/4, + height, 32, 0, I915_TILING_NONE, 0); ptr = gem_mmap__cpu_coherent(data->drm_fd, buf->handle, 0, buf->surface[0].size, PROT_WRITE); @@ -101,13 +104,16 @@ static void buf_check(uint8_t *ptr, int x, int y, uint8_t color) color, val, x, y); } -static void media_fill(data_t *data, igt_fillfunc_t fill) +static void media_fill(data_t *data, igt_fillfunc_t fill, + struct igt_collection *memregion_set) { struct intel_buf *buf; + uint32_t region; uint8_t *ptr; int i, j; - buf = create_buf(data, WIDTH, HEIGHT, COLOR_C4); + region = igt_collection_get_value(memregion_set, 0); + buf = create_buf(data, WIDTH, HEIGHT, COLOR_C4, region); ptr = gem_mmap__device_coherent(data->drm_fd, buf->handle, 0, buf->surface[0].size, PROT_READ); for (i = 0; i < WIDTH; i++) @@ -126,20 +132,45 @@ static void media_fill(data_t *data, igt_fillfunc_t fill) munmap(ptr, buf->surface[0].size); } -igt_simple_main +igt_main { data_t data = {0, }; igt_fillfunc_t fill_fn = NULL; + struct drm_i915_query_memory_regions *query_info; + struct igt_collection *set, *region_set; + + igt_fixture { + data.drm_fd = drm_open_driver_render(DRIVER_INTEL); + igt_require_gem(data.drm_fd); + + data.devid = intel_get_drm_devid(data.drm_fd); + data.bops = buf_ops_create(data.drm_fd); + + fill_fn = igt_get_media_fillfunc(data.devid); + + igt_require_f(fill_fn, "no media-fill function\n"); + + query_info = gem_get_query_memory_regions(data.drm_fd); + igt_assert(query_info); + + set = get_memory_region_set(query_info, + I915_SYSTEM_MEMORY); - data.drm_fd = drm_open_driver_render(DRIVER_INTEL); - igt_require_gem(data.drm_fd); + igt_fork_hang_detector(data.drm_fd); + } - data.devid = intel_get_drm_devid(data.drm_fd); - data.bops = buf_ops_create(data.drm_fd); + igt_subtest_with_dynamic("media-fill") + for_each_combination(region_set, 1, set) { + char *sub_name = memregion_dynamic_subtest_name(region_set); - fill_fn = igt_get_media_fillfunc(data.devid); + igt_dynamic_f("%s", sub_name) + media_fill(&data, fill_fn, region_set); - igt_require_f(fill_fn, "no media-fill function\n"); + free(sub_name); + } - media_fill(&data, fill_fn); + igt_fixture { + igt_collection_destroy(set); + igt_stop_hang_detector(); + } } -- 2.26.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx