Patch "drm/i915/selftests: Fix dependency of some timeouts on HZ" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/i915/selftests: Fix dependency of some timeouts on HZ

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-i915-selftests-fix-dependency-of-some-timeouts-o.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a698ba75274c5258a2883ac27bb7d38bfa2f5d7c
Author: Janusz Krzysztofik <janusz.krzysztofik@xxxxxxxxxxxxxxx>
Date:   Thu Feb 22 12:32:40 2024 +0100

    drm/i915/selftests: Fix dependency of some timeouts on HZ
    
    [ Upstream commit 26d2b757fff02bbe971abc39071e263aa0cab924 ]
    
    Third argument of i915_request_wait() accepts a timeout value in jiffies.
    Most users pass either a simple HZ based expression, or a result of
    msecs_to_jiffies(), or MAX_SCHEDULE_TIMEOUT, or a very small number not
    exceeding 4 if applicable as that value.  However, there is one user --
    intel_selftest_wait_for_rq() -- that passes a WAIT_FOR_RESET_TIME symbol,
    defined as a large constant value that most probably represents a desired
    timeout in ms.  While that usage results in the intended value of timeout
    on usual x86_64 kernel configurations, it is not portable across different
    architectures and custom kernel configs.
    
    Rename the symbol to clearly indicate intended units and convert it to
    jiffies before use.
    
    Fixes: 3a4bfa091c46 ("drm/i915/selftest: Fix workarounds selftest for GuC submission")
    Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@xxxxxxxxxxxxxxx>
    Cc: Rahul Kumar Singh <rahul.kumar.singh@xxxxxxxxx>
    Cc: John Harrison <John.C.Harrison@xxxxxxxxx>
    Cc: Matthew Brost <matthew.brost@xxxxxxxxx>
    Reviewed-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx>
    Signed-off-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20240222113347.648945-2-janusz.krzysztofik@xxxxxxxxxxxxxxx
    (cherry picked from commit 6ee3f54b880c91ab2e244eb4ffd4bfed37832b25)
    Signed-off-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
index 2990dd4d4a0d8..e14ac0ab1314d 100644
--- a/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
+++ b/drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
@@ -3,6 +3,8 @@
  * Copyright © 2021 Intel Corporation
  */
 
+#include <linux/jiffies.h>
+
 //#include "gt/intel_engine_user.h"
 #include "gt/intel_gt.h"
 #include "i915_drv.h"
@@ -12,7 +14,7 @@
 
 #define REDUCED_TIMESLICE	5
 #define REDUCED_PREEMPT		10
-#define WAIT_FOR_RESET_TIME	10000
+#define WAIT_FOR_RESET_TIME_MS	10000
 
 struct intel_engine_cs *intel_selftest_find_any_engine(struct intel_gt *gt)
 {
@@ -91,7 +93,7 @@ int intel_selftest_wait_for_rq(struct i915_request *rq)
 {
 	long ret;
 
-	ret = i915_request_wait(rq, 0, WAIT_FOR_RESET_TIME);
+	ret = i915_request_wait(rq, 0, msecs_to_jiffies(WAIT_FOR_RESET_TIME_MS));
 	if (ret < 0)
 		return ret;