[PATCH i-g-t 1/3] tests/intel/xe_pm: Rename and clarify mocs_suspend_resume

[Cavitt, Jonathan]

-----Original Message-----
From: igt-dev <igt-dev-bounces at lists.freedesktop.org> On Behalf Of Lucas De Marchi
Sent: Monday, May 13, 2024 9:25 AM
To: igt-dev at lists.freedesktop.org
Cc: Kumar, Janga Rahul <janga.rahul.kumar at intel.com>; Nilawar, Badal <badal.nilawar at intel.com>; De Marchi, Lucas <lucas.demarchi at intel.com>
Subject: [PATCH i-g-t 1/3] tests/intel/xe_pm: Rename and clarify mocs_suspend_resume
> 
> mocs_suspend_resume is not really suspending/resuming the CPU. It's just
> checking rpm (GPU) goes back to suspended status after dropping the
> forcewake.
> 
> Also drop the additional argument and just use the same "s_state",
> passing NO_SUSPEND in this case, like it's done in other tests in xe_pm.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Acked-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
-Jonathan Cavitt

> ---
>  tests/intel/xe_pm.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/intel/xe_pm.c b/tests/intel/xe_pm.c
> index e81a75d88..1215b5c2a 100644
> --- a/tests/intel/xe_pm.c
> +++ b/tests/intel/xe_pm.c
> @@ -617,14 +617,14 @@ static void test_mmap(device_t device, uint32_t placement, uint32_t flags)
>  }
>  
>  /**
> - * SUBTEST: mocs_suspend_resume
> + * SUBTEST: mocs-rpm
>   * Description:
>   *     Validate mocs register contents over suspend resume
>   *
>   * Functionality: mocs
>   * Run type: FULL
>   */
> -static void test_mocs_suspend_resume(device_t device, bool runtime_sr, enum igt_suspend_state state)
> +static void test_mocs_suspend_resume(device_t device, int s_state)
>  {
>  	int gt;
>  
> @@ -639,16 +639,16 @@ static void test_mocs_suspend_resume(device_t device, bool runtime_sr, enum igt_
>  		igt_debugfs_dump(device.fd_xe, path);
>  		igt_debugfs_read(device.fd_xe, path, mocs_content_pre);
>  
> -		if (runtime_sr) {
> +		if (s_state == NO_SUSPEND) {
>  			fw_handle = igt_debugfs_open(device.fd_xe, "forcewake_all", O_RDONLY);
>  			igt_assert(fw_handle >= 0);
>  			igt_assert(igt_get_runtime_pm_status() == IGT_RUNTIME_PM_STATUS_ACTIVE);
>  
> -			/* Runtime suspend  */
> +			/* Make sure runtime pm goes back to suspended status after closing forcewake_all */
>  			close(fw_handle);
>  			igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
>  		} else {
> -			igt_system_suspend_autoresume(state, SUSPEND_TEST_NONE);
> +			igt_system_suspend_autoresume(s_state, SUSPEND_TEST_NONE);
>  		}
>  		igt_assert(igt_debugfs_exists(device.fd_xe, path, O_RDONLY));
>  		igt_debugfs_dump(device.fd_xe, path);
> @@ -758,7 +758,7 @@ igt_main
>  		}
>  
>  		igt_subtest_f("%s-mocs", s->name)
> -			test_mocs_suspend_resume(device, 0, s->state);
> +			test_mocs_suspend_resume(device, s->state);
>  	}
>  
>  	for (const struct d_state *d = d_states; d->name; d++) {
> @@ -824,8 +824,8 @@ igt_main
>  			igt_pm_set_autosuspend_delay(device.pci_xe, delay_ms);
>  		}
>  
> -		igt_subtest("mocs_suspend_resume")
> -			test_mocs_suspend_resume(device, 1, 0);
> +		igt_subtest("mocs-rpm")
> +			test_mocs_suspend_resume(device, NO_SUSPEND);
>  	}
>  
>  	igt_fixture {
> -- 
> 2.43.0
> 
>