@@ -6,6 +6,7 @@
#include <linux/crc32.h>
#include "gem/i915_gem_stolen.h"
+#include "gt/intel_gt.h"
#include "i915_memcpy.h"
#include "i915_selftest.h"
@@ -26,6 +27,7 @@ __igt_reset_stolen(struct intel_gt *gt,
intel_wakeref_t wakeref;
enum intel_engine_id id;
struct igt_spinner spin;
+ struct i915_request *requests[I915_NUM_ENGINES] = {0};
long max, count;
void *tmp;
u32 *crc;
@@ -68,15 +70,16 @@ __igt_reset_stolen(struct intel_gt *gt,
ce = intel_context_create(engine);
if (IS_ERR(ce)) {
err = PTR_ERR(ce);
- goto err_spin;
+ goto err_requests;
}
rq = igt_spinner_create_request(&spin, ce, MI_ARB_CHECK);
intel_context_put(ce);
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
- goto err_spin;
+ goto err_requests;
}
i915_request_add(rq);
+ requests[id] = i915_request_get(rq);
}
for (page = 0; page < num_pages; page++) {
@@ -165,6 +168,34 @@ __igt_reset_stolen(struct intel_gt *gt,
err = -EINVAL;
}
+ /* wait for requests and idle, otherwise cleanup can happen on next loop */
+ for (id = 0; id < I915_NUM_ENGINES; id++) {
+ if (!requests[id])
+ continue;
+ err = i915_request_wait(requests[id], I915_WAIT_INTERRUPTIBLE, HZ);
+ if (err < 0) {
+ pr_err("%s failed to wait for rq: %d\n", msg, err);
+ goto err_requests;
+ }
+
+ i915_request_put(requests[id]);
+ requests[id] = NULL;
+ }
+
+ err = intel_gt_wait_for_idle(gt, HZ);
+ if (err < 0) {
+ pr_err("%s failed to wait for gt idle: %d\n", msg, err);
+ goto err_spin;
+ }
+
+ err = 0;
+
+err_requests:
+ for (id = 0; id < I915_NUM_ENGINES; id++) {
+ if (!requests[id])
+ continue;
+ i915_request_put(requests[id]);
+ }
err_spin:
igt_spinner_fini(&spin);
While looping around each engine and testing for corrupted solen memory during engine reset, the old requests from the previous engine can still be yet to retire. To prevent false positive corruption tests, wait for the outstanding requests at the end of the test Signed-off-by: Robert Beckett <bob.beckett@collabora.com> --- drivers/gpu/drm/i915/gt/selftest_reset.c | 35 ++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-)