From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3FC1710E667 for ; Fri, 22 Sep 2023 13:24:31 +0000 (UTC) From: Anshuman Gupta To: igt-dev@lists.freedesktop.org Date: Fri, 22 Sep 2023 18:54:00 +0530 Message-Id: <20230922132401.177284-3-anshuman.gupta@intel.com> In-Reply-To: <20230922132401.177284-1-anshuman.gupta@intel.com> References: <20230922132401.177284-1-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t v2 2/3] test/xe_pm: Use fw_handle exit handler for vram-d3cold-threshold List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: badal.nilawar@intel.com, rodrigo.vivi@intel.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Scaling forcewake close exit handler for vram-d3cold-threshold subtest, while doing so add the missing subtest Functionality as well. Signed-off-by: Anshuman Gupta --- tests/intel/xe_pm.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/intel/xe_pm.c b/tests/intel/xe_pm.c index 5495da154..0c15f8d15 100644 --- a/tests/intel/xe_pm.c +++ b/tests/intel/xe_pm.c @@ -378,6 +378,7 @@ NULL)); * Description: * Validate whether card is limited to d3hot while vram used * is greater than vram_d3cold_threshold. + * Functionality: pm-d3cold */ static void test_vram_d3cold_threshold(device_t device, int sysfs_fd) { @@ -390,7 +391,7 @@ static void test_vram_d3cold_threshold(device_t device, int sysfs_fd) }; uint64_t vram_used_mb = 0, vram_total_mb = 0, threshold; uint32_t bo, flags; - int handle, i; + int i; bool active; void *map; @@ -436,10 +437,10 @@ static void test_vram_d3cold_threshold(device_t device, int sysfs_fd) * the device from runtime suspend. * Therefore open and close fw handle to wake the device. */ - handle = igt_debugfs_open(device.fd_xe, "forcewake_all", O_RDONLY); - igt_assert(handle >= 0); + fw_handle = igt_debugfs_open(device.fd_xe, "forcewake_all", O_RDONLY); + igt_assert(fw_handle >= 0); active = igt_get_runtime_pm_status() == IGT_RUNTIME_PM_STATUS_ACTIVE; - close(handle); + close(fw_handle); igt_assert(active); /* Test D3Cold again after freeing up the Xe BO */ @@ -606,18 +607,19 @@ igt_main } } - igt_describe("Validate whether card is limited to d3hot, if vram used > vram threshold"); - igt_subtest("vram-d3cold-threshold") { - orig_threshold = get_vram_d3cold_threshold(sysfs_fd); - igt_install_exit_handler(vram_d3cold_threshold_restore); - test_vram_d3cold_threshold(device, sysfs_fd); - } - igt_subtest_group { igt_fixture { igt_install_exit_handler(close_fw_handle); } + igt_describe("Validate whether card is limited to d3hot," + "if vram used > vram threshold"); + igt_subtest("vram-d3cold-threshold") { + orig_threshold = get_vram_d3cold_threshold(sysfs_fd); + igt_install_exit_handler(vram_d3cold_threshold_restore); + test_vram_d3cold_threshold(device, sysfs_fd); + } + igt_describe("Validate mmap memory mappings with system region," "when device along with parent bridge in d3"); igt_subtest("d3-mmap-system") { -- 2.25.1