Commit 6ee3f54b authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Andi Shyti

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

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: 3a4bfa09 ("drm/i915/selftest: Fix workarounds selftest for GuC submission")
Signed-off-by: default avatarJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Rahul Kumar Singh <rahul.kumar.singh@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240222113347.648945-2-janusz.krzysztofik@linux.intel.com
parent 6616e048
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
* Copyright © 2021 Intel Corporation * Copyright © 2021 Intel Corporation
*/ */
#include <linux/jiffies.h>
//#include "gt/intel_engine_user.h" //#include "gt/intel_engine_user.h"
#include "gt/intel_gt.h" #include "gt/intel_gt.h"
#include "i915_drv.h" #include "i915_drv.h"
...@@ -12,7 +14,7 @@ ...@@ -12,7 +14,7 @@
#define REDUCED_TIMESLICE 5 #define REDUCED_TIMESLICE 5
#define REDUCED_PREEMPT 10 #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) 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) ...@@ -91,7 +93,7 @@ int intel_selftest_wait_for_rq(struct i915_request *rq)
{ {
long ret; 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) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment