[PATCH i-g-t v5 1/4] test/xe_pm: Add exit handler to close fw handle
Anshuman Gupta
anshuman.gupta at intel.com
Fri Jan 19 11:55:51 UTC 2024
Adding an exit handler to close the fw handle to make sure we don't
leak the fw in CI environment. Adding a IGT subtest group for the
test using the fw handle to runtime wake the device.
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 <anshuman.gupta at intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
tests/intel/xe_pm.c | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/tests/intel/xe_pm.c b/tests/intel/xe_pm.c
index 4afe37d93..f793fd24e 100644
--- a/tests/intel/xe_pm.c
+++ b/tests/intel/xe_pm.c
@@ -40,6 +40,7 @@ typedef struct {
} device_t;
uint64_t orig_threshold;
+int fw_handle = -1;
static void dpms_on_off(device_t device, int mode)
{
@@ -195,6 +196,14 @@ static bool out_of_d3(device_t device, enum igt_acpi_d_state state)
return true;
}
+static void close_fw_handle(int sig)
+{
+ if (fw_handle < 0)
+ return;
+
+ close(fw_handle);
+}
+
/**
* SUBTEST: %s-basic
* Description: set GPU state to %arg[1] and test suspend/autoresume
@@ -411,9 +420,9 @@ 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, placement;
- int handle, i;
bool active;
void *map;
+ int i;
igt_require(xe_has_vram(device.fd_xe));
@@ -457,10 +466,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 */
@@ -570,11 +579,18 @@ 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_fixture {
--
2.25.1
More information about the igt-dev
mailing list