OSDN Git Service

drm/i915/selftests: Tidy up an error message for live_error_interrupt
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 31 Mar 2020 09:14:56 +0000 (10:14 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 31 Mar 2020 20:42:12 +0000 (21:42 +0100)
Since we don't wait for the error interrupt to reset, restart and then
complete the guilty request, clean up the error messages.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200331091459.29179-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/selftest_lrc.c

index d3e163c..b929e52 100644 (file)
@@ -649,9 +649,9 @@ static int live_error_interrupt(void *arg)
                                                 error_repr(p->error[i]));
 
                                if (!i915_request_started(client[i])) {
-                                       pr_debug("%s: %s request not stated!\n",
-                                                engine->name,
-                                                error_repr(p->error[i]));
+                                       pr_err("%s: %s request not started!\n",
+                                              engine->name,
+                                              error_repr(p->error[i]));
                                        err = -ETIME;
                                        goto out;
                                }
@@ -659,9 +659,10 @@ static int live_error_interrupt(void *arg)
                                /* Kick the tasklet to process the error */
                                intel_engine_flush_submission(engine);
                                if (client[i]->fence.error != p->error[i]) {
-                                       pr_err("%s: %s request completed with wrong error code: %d\n",
+                                       pr_err("%s: %s request (%s) with wrong error code: %d\n",
                                               engine->name,
                                               error_repr(p->error[i]),
+                                              i915_request_completed(client[i]) ? "completed" : "running",
                                               client[i]->fence.error);
                                        err = -EINVAL;
                                        goto out;