Commit 29991d53 authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Rename wait_for_hang() to wait_until_running()

Tvrtko mentioned that wait_for_hang() was confusing as it does not
actually wait for the aforementioned hang, just until the request is
running and we are *ready* to inject a hang. A quick
s/wait_for_hang/wait_until_running/ removes that confusion without
having to rethink the naming scheme, immediately at least.
Suggested-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180406100950.19033-1-chris@chris-wilson.co.uk
parent 2b2874ef
...@@ -322,7 +322,7 @@ static void hang_fini(struct hang *h) ...@@ -322,7 +322,7 @@ static void hang_fini(struct hang *h)
flush_test(h->i915, I915_WAIT_LOCKED); flush_test(h->i915, I915_WAIT_LOCKED);
} }
static bool wait_for_hang(struct hang *h, struct i915_request *rq) static bool wait_until_running(struct hang *h, struct i915_request *rq)
{ {
return !(wait_for_us(i915_seqno_passed(hws_seqno(h, rq), return !(wait_for_us(i915_seqno_passed(hws_seqno(h, rq),
rq->fence.seqno), rq->fence.seqno),
...@@ -504,7 +504,7 @@ static int __igt_reset_engine(struct drm_i915_private *i915, bool active) ...@@ -504,7 +504,7 @@ static int __igt_reset_engine(struct drm_i915_private *i915, bool active)
__i915_request_add(rq, true); __i915_request_add(rq, true);
mutex_unlock(&i915->drm.struct_mutex); mutex_unlock(&i915->drm.struct_mutex);
if (!wait_for_hang(&h, rq)) { if (!wait_until_running(&h, rq)) {
struct drm_printer p = drm_info_printer(i915->drm.dev); struct drm_printer p = drm_info_printer(i915->drm.dev);
pr_err("%s: Failed to start request %x, at %x\n", pr_err("%s: Failed to start request %x, at %x\n",
...@@ -747,7 +747,7 @@ static int __igt_reset_engines(struct drm_i915_private *i915, ...@@ -747,7 +747,7 @@ static int __igt_reset_engines(struct drm_i915_private *i915,
__i915_request_add(rq, true); __i915_request_add(rq, true);
mutex_unlock(&i915->drm.struct_mutex); mutex_unlock(&i915->drm.struct_mutex);
if (!wait_for_hang(&h, rq)) { if (!wait_until_running(&h, rq)) {
struct drm_printer p = drm_info_printer(i915->drm.dev); struct drm_printer p = drm_info_printer(i915->drm.dev);
pr_err("%s: Failed to start request %x, at %x\n", pr_err("%s: Failed to start request %x, at %x\n",
...@@ -935,7 +935,7 @@ static int igt_wait_reset(void *arg) ...@@ -935,7 +935,7 @@ static int igt_wait_reset(void *arg)
i915_request_get(rq); i915_request_get(rq);
__i915_request_add(rq, true); __i915_request_add(rq, true);
if (!wait_for_hang(&h, rq)) { if (!wait_until_running(&h, rq)) {
struct drm_printer p = drm_info_printer(i915->drm.dev); struct drm_printer p = drm_info_printer(i915->drm.dev);
pr_err("%s: Failed to start request %x, at %x\n", pr_err("%s: Failed to start request %x, at %x\n",
...@@ -1066,7 +1066,7 @@ static int igt_reset_queue(void *arg) ...@@ -1066,7 +1066,7 @@ static int igt_reset_queue(void *arg)
goto fini; goto fini;
} }
if (!wait_for_hang(&h, prev)) { if (!wait_until_running(&h, prev)) {
struct drm_printer p = drm_info_printer(i915->drm.dev); struct drm_printer p = drm_info_printer(i915->drm.dev);
pr_err("%s(%s): Failed to start request %x, at %x\n", pr_err("%s(%s): Failed to start request %x, at %x\n",
...@@ -1177,7 +1177,7 @@ static int igt_handle_error(void *arg) ...@@ -1177,7 +1177,7 @@ static int igt_handle_error(void *arg)
i915_request_get(rq); i915_request_get(rq);
__i915_request_add(rq, true); __i915_request_add(rq, true);
if (!wait_for_hang(&h, rq)) { if (!wait_until_running(&h, rq)) {
struct drm_printer p = drm_info_printer(i915->drm.dev); struct drm_printer p = drm_info_printer(i915->drm.dev);
pr_err("%s: Failed to start request %x, at %x\n", pr_err("%s: Failed to start request %x, at %x\n",
......
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