1 files changed, 15 insertions, 8 deletions

diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index 63cd9486cc13..c4aac6141e04 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -262,7 +262,7 @@ int i915_request_mock_selftests(void)
                 return -ENOMEM;
 
         err = i915_subtests(tests, i915);
-        drm_dev_unref(&i915->drm);
+        drm_dev_put(&i915->drm);
 
         return err;
 }
@@ -286,7 +286,9 @@ static int begin_live_test(struct live_test *t,
         t->func = func;
         t->name = name;
 
-        err = i915_gem_wait_for_idle(i915, I915_WAIT_LOCKED);
+        err = i915_gem_wait_for_idle(i915,
+                                     I915_WAIT_LOCKED,
+                                     MAX_SCHEDULE_TIMEOUT);
         if (err) {
                 pr_err("%s(%s): failed to idle before, with err=%d!",
                        func, name, err);
@@ -594,11 +596,8 @@ static struct i915_vma *recursive_batch(struct drm_i915_private *i915)
         } else if (gen >= 6) {
                 *cmd++ = MI_BATCH_BUFFER_START | 1 << 8;
                 *cmd++ = lower_32_bits(vma->node.start);
-        } else if (gen >= 4) {
-                *cmd++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT;
-                *cmd++ = lower_32_bits(vma->node.start);
         } else {
-                *cmd++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT | 1;
+                *cmd++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT;
                 *cmd++ = lower_32_bits(vma->node.start);
         }
         *cmd++ = MI_BATCH_BUFFER_END; /* terminate early in case of error */
@@ -678,7 +677,9 @@ static int live_all_engines(void *arg)
                         i915_gem_object_set_active_reference(batch->obj);
                 }
 
-                i915_vma_move_to_active(batch, request[id], 0);
+                err = i915_vma_move_to_active(batch, request[id], 0);
+                GEM_BUG_ON(err);
+
                 i915_request_get(request[id]);
                 i915_request_add(request[id]);
         }
@@ -788,7 +789,9 @@ static int live_sequential_engines(void *arg)
                 GEM_BUG_ON(err);
                 request[id]->batch = batch;
 
-                i915_vma_move_to_active(batch, request[id], 0);
+                err = i915_vma_move_to_active(batch, request[id], 0);
+                GEM_BUG_ON(err);
+
                 i915_gem_object_set_active_reference(batch->obj);
                 i915_vma_get(batch);
 
@@ -862,5 +865,9 @@ int i915_request_live_selftests(struct drm_i915_private *i915)
                 SUBTEST(live_sequential_engines),
                 SUBTEST(live_empty_request),
         };
+
+        if (i915_terminally_wedged(&i915->gpu_error))
+                return 0;
+
         return i915_subtests(tests, i915);
 }