From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 360A4112B4E for ; Tue, 17 May 2022 13:31:29 +0000 (UTC) From: Anshuman Gupta To: igt-dev@lists.freedesktop.org Date: Tue, 17 May 2022 19:01:07 +0530 Message-Id: <20220517133112.25507-2-anshuman.gupta@intel.com> In-Reply-To: <20220517133112.25507-1-anshuman.gupta@intel.com> References: <20220517133112.25507-1-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 1/6] test/i915_pm_rpm: Add placement to gem-{mmap-type, execbuf} List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: petri.latvala@intel.com, Chris Wilson , badal.nilawar@intel.com, rodrigo.vivi@intel.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Add memory region placement to gem-{mmap-type, execbuf} subtest. This will be useful to extend these sub-test for D3Cold. Cc: Chris Wilson Cc: Rodrigo Vivi Signed-off-by: Anshuman Gupta Reviewed-by: Rodrigo Vivi --- tests/i915/i915_pm_rpm.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c index 461730e8a5..d2bce5826e 100644 --- a/tests/i915/i915_pm_rpm.c +++ b/tests/i915/i915_pm_rpm.c @@ -1069,7 +1069,8 @@ static void debugfs_forcewake_user_subtest(void) igt_assert(wait_for_suspended()); } -static void gem_mmap_args(const struct mmap_offset *t) +static void gem_mmap_args(const struct mmap_offset *t, + struct drm_i915_gem_memory_class_instance *mem_regions) { int i; uint32_t handle; @@ -1079,7 +1080,7 @@ static void gem_mmap_args(const struct mmap_offset *t) /* Create, map and set data while the device is active. */ enable_one_screen_and_wait(&ms_data); - handle = gem_create(drm_fd, buf_size); + handle = gem_create_in_memory_region_list(drm_fd, buf_size, mem_regions, 1); gem_buf = __gem_mmap_offset(drm_fd, handle, 0, buf_size, PROT_READ | PROT_WRITE, t->type); @@ -1290,7 +1291,7 @@ static void submit_blt_cmd(uint32_t dst_handle, int dst_size, } /* Make sure we can submit a batch buffer and verify its result. */ -static void gem_execbuf_subtest(void) +static void gem_execbuf_subtest(struct drm_i915_gem_memory_class_instance *mem_regions) { int x, y; uint32_t handle; @@ -1308,7 +1309,7 @@ static void gem_execbuf_subtest(void) /* Create and set data while the device is active. */ enable_one_screen_and_wait(&ms_data); - handle = gem_create(drm_fd, dst_size); + handle = gem_create_in_memory_region_list(drm_fd, dst_size, mem_regions, 1); cpu_buf = malloc(dst_size); igt_assert(cpu_buf); @@ -2083,15 +2084,21 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) /* GEM */ igt_subtest_with_dynamic("gem-mmap-type") { for_each_mmap_offset_type(drm_fd, t) { - igt_dynamic_f("%s", t->name) - gem_mmap_args(t); + for_each_memory_region(r, drm_fd) { + igt_dynamic_f("%s-%s", t->name, r->name) + gem_mmap_args(t, &r->ci); + } } } igt_subtest("gem-pread") gem_pread_subtest(); - igt_subtest("gem-execbuf") - gem_execbuf_subtest(); + igt_subtest_with_dynamic("gem-execbuf") { + for_each_memory_region(r, drm_fd) { + igt_dynamic_f("%s", r->name) + gem_execbuf_subtest(&r->ci); + } + } igt_subtest("gem-idle") gem_idle_subtest(); igt_subtest("gem-evict-pwrite") { -- 2.26.2