From patchwork Thu Sep 4 22:27:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 4848341 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 43BEB9F9DF for ; Thu, 4 Sep 2014 22:27:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 479FE202B4 for ; Thu, 4 Sep 2014 22:27:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5D9E220279 for ; Thu, 4 Sep 2014 22:27:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D7796E21C; Thu, 4 Sep 2014 15:27:09 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 555666E21C for ; Thu, 4 Sep 2014 15:27:08 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 04 Sep 2014 15:21:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,469,1406617200"; d="scan'208";a="568573387" Received: from rdvivi-bratislava.jf.intel.com ([10.7.196.84]) by orsmga001.jf.intel.com with ESMTP; 04 Sep 2014 15:27:06 -0700 From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Thu, 4 Sep 2014 18:27:05 -0400 Message-Id: <1409869625-7816-5-git-send-email-rodrigo.vivi@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1409869625-7816-1-git-send-email-rodrigo.vivi@intel.com> References: <1409869625-7816-1-git-send-email-rodrigo.vivi@intel.com> Cc: Rodrigo Vivi Subject: [Intel-gfx] [PATCH 5/5] tests/kms_psr_sink_crc: Cleaning up tests a bit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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=-5.8 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 This is needed to be able to split tests in a matrix that tests different input/write methods and operations for different type of planes. Signed-off-by: Rodrigo Vivi --- tests/kms_psr_sink_crc.c | 67 ------------------------------------------------ 1 file changed, 67 deletions(-) diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c index f878889..defac82 100644 --- a/tests/kms_psr_sink_crc.c +++ b/tests/kms_psr_sink_crc.c @@ -41,16 +41,8 @@ enum tests { TEST_PAGE_FLIP, TEST_MMAP_CPU, TEST_MMAP_GTT, - TEST_MMAP_GTT_NO_BUSY, - TEST_MMAP_GTT_WAITING_NO_BUSY, - TEST_SETDOMAIN_WAIT_WRITE_GTT, - TEST_SETDOMAIN_WAIT_WRITE_CPU, TEST_BLT, TEST_RENDER, - TEST_PAGE_FLIP_AND_MMAP_CPU, - TEST_PAGE_FLIP_AND_MMAP_GTT, - TEST_PAGE_FLIP_AND_BLT, - TEST_PAGE_FLIP_AND_RENDER, TEST_CURSOR_MOVE, TEST_SPRITE, }; @@ -78,16 +70,8 @@ static const char *tests_str(enum tests test) [TEST_PAGE_FLIP] = "page_flip", [TEST_MMAP_CPU] = "mmap_cpu", [TEST_MMAP_GTT] = "mmap_gtt", - [TEST_MMAP_GTT_NO_BUSY] = "mmap_gtt_no_busy", - [TEST_MMAP_GTT_WAITING_NO_BUSY] = "mmap_gtt_waiting_no_busy", - [TEST_SETDOMAIN_WAIT_WRITE_GTT] = "setdomain_wait_write_gtt", - [TEST_SETDOMAIN_WAIT_WRITE_CPU] = "setdomain_wait_write_cpu", [TEST_BLT] = "blt", [TEST_RENDER] = "render", - [TEST_PAGE_FLIP_AND_MMAP_CPU] = "page_flip_and_mmap_cpu", - [TEST_PAGE_FLIP_AND_MMAP_GTT] = "page_flip_and_mmap_gtt", - [TEST_PAGE_FLIP_AND_BLT] = "page_flip_and_blt", - [TEST_PAGE_FLIP_AND_RENDER] = "page_flip_and_render", [TEST_CURSOR_MOVE] = "cursor_move", [TEST_SPRITE] = "sprite", }; @@ -336,10 +320,6 @@ static void test_crc(data_t *data) igt_assert(drmModePageFlip(data->drm_fd, data->crtc_id, data->fb_id[1], 0, NULL) == 0); break; - case TEST_PAGE_FLIP_AND_MMAP_CPU: - handle = data->handle[1]; - igt_assert(drmModePageFlip(data->drm_fd, data->crtc_id, - data->fb_id[1], 0, NULL) == 0); case TEST_MMAP_CPU: ptr = gem_mmap__cpu(data->drm_fd, handle, 4096, PROT_WRITE); gem_set_domain(data->drm_fd, handle, @@ -350,10 +330,6 @@ static void test_crc(data_t *data) sleep(1); gem_sw_finish(data->drm_fd, handle); break; - case TEST_PAGE_FLIP_AND_MMAP_GTT: - handle = data->handle[1]; - igt_assert(drmModePageFlip(data->drm_fd, data->crtc_id, - data->fb_id[1], 0, NULL) == 0); case TEST_MMAP_GTT: ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE); gem_set_domain(data->drm_fd, handle, @@ -362,53 +338,10 @@ static void test_crc(data_t *data) munmap(ptr, 4096); gem_bo_busy(data->drm_fd, handle); break; - case TEST_MMAP_GTT_NO_BUSY: - ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE); - gem_set_domain(data->drm_fd, handle, - I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); - memset(ptr, 0xff, 4); - munmap(ptr, 4096); - break; - case TEST_MMAP_GTT_WAITING_NO_BUSY: - ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE); - gem_set_domain(data->drm_fd, handle, - I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); - igt_info("Sleeping for 10 sec...\n"); - sleep(10); - memset(ptr, 0xff, 4); - munmap(ptr, 4096); - break; - case TEST_SETDOMAIN_WAIT_WRITE_GTT: - ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE); - fill_blt(data, handle, 0xff); - igt_assert(wait_psr_entry(data, 10)); - get_sink_crc(data, ref_crc); - gem_set_domain(data->drm_fd, handle, - I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); - igt_info("Sleeping for 10 sec...\n"); - sleep(10); - memset(ptr, 0xff, 4); - munmap(ptr, 4096); - break; - case TEST_SETDOMAIN_WAIT_WRITE_CPU: - ptr = gem_mmap__cpu(data->drm_fd, handle, 4096, PROT_WRITE); - fill_blt(data, handle, 0xff); - igt_assert(wait_psr_entry(data, 10)); - get_sink_crc(data, ref_crc); - gem_set_domain(data->drm_fd, handle, - I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); - igt_info("Sleeping for 10 sec...\n"); - sleep(10); - memset(ptr, 0xff, 4); - munmap(ptr, 4096); - gem_sw_finish(data->drm_fd, handle); - break; case TEST_BLT: - case TEST_PAGE_FLIP_AND_BLT: fill_blt(data, handle, 0xff); break; case TEST_RENDER: - case TEST_PAGE_FLIP_AND_RENDER: fill_render(data, handle, 0xff); break; case TEST_CURSOR_MOVE: