Re: [PATCH i-g-t 3/3] tests/intel/xe_pm: Add mocs S2-idle/S3/S4 suspend resume test

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Sat, May 04, 2024 at 06:34:58PM +0530, janga.rahul.kumar@intel.com wrote:
> From: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> 
> Add test to check mocs values are retained over S2-idle/S3/S4
> suspend resume states.
> 
> Cc: Badal Nilawar <badal.nilawar@intel.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> ---
>  tests/intel/xe_pm.c | 29 +++++++++++++++++++----------
>  1 file changed, 19 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/intel/xe_pm.c b/tests/intel/xe_pm.c
> index 73fd57636..fe77512fb 100644
> --- a/tests/intel/xe_pm.c
> +++ b/tests/intel/xe_pm.c
> @@ -251,6 +251,10 @@ static void close_fw_handle(int sig)
>   * Description: suspend/autoresume on %arg[1] state and exec after RPM
>   * Functionality: pm - %arg[1]
>   *
> + * SUBTEST: %s-mocs
> + * Description: test checks for mocs state before and after %arg[1] state
> + * Functionality: pm - %arg[1]
> + *
>   * arg[1]:
>   *
>   * @s2idle:	s2idle
> @@ -617,7 +621,7 @@ static void test_mmap(device_t device, uint32_t placement, uint32_t flags)
>   * Functionality: mocs
>   * Run type: FULL
>   */
> -static void test_mocs_suspend_resume(device_t device)
> +static void test_mocs_suspend_resume(device_t device, bool runtime_sr, enum igt_suspend_state state)
>  {
>  	int gt;
>  
> @@ -632,14 +636,17 @@ static void test_mocs_suspend_resume(device_t device)
>  		igt_debugfs_dump(device.fd_xe, path);
>  		igt_debugfs_read(device.fd_xe, path, mocs_content_pre);
>  
> -		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  */
> -		close(fw_handle);
> -		igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
> +		if (runtime_sr) {
> +			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  */
> +			close(fw_handle);
> +			igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
> +		} else {
> +			igt_system_suspend_autoresume(state, SUSPEND_TEST_NONE);

please notice that Lucas had recently changed the S4 case in the test_exec function.
We should follow that, or this will break in CI again.

> +		}
>  		igt_assert(igt_debugfs_exists(device.fd_xe, path, O_RDONLY));
>  		igt_debugfs_dump(device.fd_xe, path);
>  		igt_debugfs_read(device.fd_xe, path, mocs_contents_post);
> @@ -742,6 +749,9 @@ igt_main
>  				cleanup_d3(device);
>  			}
>  		}
> +
> +		igt_subtest_f("%s-mocs", s->name)
> +			test_mocs_suspend_resume(device, 0, s->state);
>  	}
>  
>  	for (const struct d_state *d = d_states; d->name; d++) {
> @@ -808,8 +818,7 @@ igt_main
>  		}
>  
>  		igt_subtest("mocs_suspend_resume")
> -			test_mocs_suspend_resume(device);
> -
> +			test_mocs_suspend_resume(device, 1, 0);
>  	}
>  
>  	igt_fixture {
> -- 
> 2.25.1
>