From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id CD5076E908 for ; Mon, 17 Feb 2020 09:40:27 +0000 (UTC) From: Ramalingam C Date: Mon, 17 Feb 2020 15:10:45 +0530 Message-Id: <20200217094045.6788-1-ramalingam.c@intel.com> In-Reply-To: <20200207134527.17205-2-ramalingam.c@intel.com> References: <20200207134527.17205-2-ramalingam.c@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] tests/i915_pm_rpm: mmap type based dynamic subtests List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev List-ID: Tests for gem_mmap_gtt/cpu are replaced with dynamic subtests with the array of mmap_types passed to gem_mmap_offset. Signed-off-by: Ramalingam C cc: Chris Wilson --- tests/i915/i915_pm_rpm.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c index 3d7343240802..0c2821122956 100644 --- a/tests/i915/i915_pm_rpm.c +++ b/tests/i915/i915_pm_rpm.c @@ -1007,7 +1007,7 @@ static void debugfs_forcewake_user_subtest(void) igt_assert(wait_for_suspended()); } -static void gem_mmap_subtest(bool gtt_mmap) +static void gem_mmap_args(const struct mmap_offset *t) { int i; uint32_t handle; @@ -1019,14 +1019,9 @@ static void gem_mmap_subtest(bool gtt_mmap) handle = gem_create(drm_fd, buf_size); - if (gtt_mmap) { - gem_buf = gem_mmap__gtt(drm_fd, handle, buf_size, - PROT_READ | PROT_WRITE); - } - else { - gem_buf = gem_mmap__cpu(drm_fd, handle, 0, buf_size, 0); - } - + gem_buf = __gem_mmap_offset(drm_fd, handle, 0, buf_size, + PROT_READ | PROT_WRITE, t->type); + igt_require(gem_buf); for (i = 0; i < buf_size; i++) gem_buf[i] = i & 0xFF; @@ -1056,13 +1051,9 @@ static void gem_mmap_subtest(bool gtt_mmap) * suspended. */ disable_all_screens_and_wait(&ms_data); - if (gtt_mmap) { - gem_buf = gem_mmap__gtt(drm_fd, handle, buf_size, - PROT_READ | PROT_WRITE); - } - else { - gem_buf = gem_mmap__cpu(drm_fd, handle, 0, buf_size, 0); - } + gem_buf = __gem_mmap_offset(drm_fd, handle, 0, buf_size, + PROT_READ | PROT_WRITE, t->type); + igt_require(gem_buf); igt_assert(wait_for_suspended()); @@ -2014,10 +2005,13 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) modeset_subtest(SCREEN_TYPE_NON_LPSP, 1, WAIT_STATUS | USE_DPMS); /* GEM */ - igt_subtest("gem-mmap-cpu") - gem_mmap_subtest(false); - igt_subtest("gem-mmap-gtt") - gem_mmap_subtest(true); + igt_subtest_with_dynamic("gem-mmap-type") { + for_each_mmap_offset_type(t) { + igt_dynamic_f("%s", t->name) + gem_mmap_args(t); + } + } + igt_subtest("gem-pread") gem_pread_subtest(); igt_subtest("gem-execbuf") -- 2.20.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev