[PATCH 1/2] Revert "tests/intel/xe_sysfs_timeslice_duration: Restore preempt timeout"

[Kamil Konieczny]

Hi Jonathan,
On 2024-12-06 at 21:54:58 +0000, Jonathan Cavitt wrote:
> This reverts commit f33842ab06b7470c9c9ec482bfd123b2d58507af.
> 
> The commit refers to the wrong link in the Closes field, so that needs
> to be changed.

Nak, as discussed offline imho we should live with wrong 'Closes' tag,
just make sure you correct this in GitLab issues. You could also send
replay to original wrong merged patch so it will be possible to find-out
later on lore.kernel.org

Regards,
Kamil

> 
> Signed-off-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
> ---
>  tests/intel/xe_sysfs_timeslice_duration.c | 19 ++-----------------
>  1 file changed, 2 insertions(+), 17 deletions(-)
> 
> diff --git a/tests/intel/xe_sysfs_timeslice_duration.c b/tests/intel/xe_sysfs_timeslice_duration.c
> index 752672691f..899093a9df 100644
> --- a/tests/intel/xe_sysfs_timeslice_duration.c
> +++ b/tests/intel/xe_sysfs_timeslice_duration.c
> @@ -115,11 +115,10 @@ static uint64_t __test_timeout(int fd, int engine, unsigned int timeout, uint16_
>  static void test_timeout(int fd, int engine, const char **property, uint16_t class, int gt)
>  {
>  	uint64_t delays[] = { 1000, 50000, 100000, 500000 };
> -	unsigned int saved, old_pt;
> +	unsigned int saved;
>  	uint64_t elapsed;
>  	uint64_t epsilon;
>  
> -	igt_assert(igt_sysfs_scanf(engine, "preempt_timeout_us", "%u", &old_pt) == 1);
>  	igt_require(igt_sysfs_printf(engine, "preempt_timeout_us", "%u", 1) == 1);
>  	igt_assert(igt_sysfs_scanf(engine, property[0], "%u", &saved) == 1);
>  	igt_debug("Initial %s:%u\n", property[0], saved);
> @@ -141,9 +140,6 @@ static void test_timeout(int fd, int engine, const char **property, uint16_t cla
>  	}
>  
>  	set_timeslice_duration(engine, saved);
> -	igt_assert_lte(0, igt_sysfs_printf(engine, "preempt_timeout_us", "%u", old_pt));
> -	igt_sysfs_scanf(engine, "preempt_timeout_us", "%u", &saved);
> -	igt_assert_eq(saved, old_pt);
>  }
>  
>  #define	MAX_GTS	8
> @@ -163,7 +159,6 @@ igt_main
>  	int gt_count = 0;
>  	int fd = -1, sys_fd, gt;
>  	int engines_fd[MAX_GTS], gt_fd[MAX_GTS];
> -	unsigned int pts[MAX_GTS][XE_MAX_ENGINE_INSTANCE];
>  	unsigned int tds[MAX_GTS][XE_MAX_ENGINE_INSTANCE];
>  	int *engine_list[MAX_GTS];
>  
> @@ -189,8 +184,6 @@ igt_main
>  			while (list[i] != -1) {
>  				igt_require(igt_sysfs_scanf(list[i], "timeslice_duration_us", "%u",
>  							    &tds[gt_count][i]) == 1);
> -				igt_require(igt_sysfs_scanf(list[i], "preempt_timeout_us", "%u",
> -							    &pts[gt_count][i]) == 1);
>  				i++;
>  			}
>  
> @@ -222,16 +215,8 @@ igt_main
>  			while (list[j] != -1) {
>  				unsigned int store = UINT_MAX;
>  
> -				igt_sysfs_printf(list[j], "preempt_timeout_us",
> -						 "%u", pts[i][j]);
> -				igt_sysfs_scanf(list[j], "preempt_timeout_us",
> -						"%u", &store);
> -				igt_abort_on_f(store != pts[i][j],
> -					       "preempt_timeout_us not restored!\n");
> -
> -				store = UINT_MAX;
>  				igt_sysfs_printf(list[j], "timeslice_duration_us",
> -						 "%u", tds[i][j]);
> +						"%u", tds[i][j]);
>  				igt_sysfs_scanf(list[j], "timeslice_duration_us",
>  						"%u", &store);
>  				igt_abort_on_f(store != tds[i][j],
> -- 
> 2.43.0
>