drm/i915/selftests: Flush GPU activity before completing live_contexts

igt_ctx_exec() expects that we retire all active requests/objects before
completing, so that when we clean up the files afterwards they are ready
to be freed. Before we do so, it is then prudent to ensure that we have
indeed retired the GPU activity, raising an error if it fails. If we do
not, we run the risk of triggering an assertion when freeing the object:

  __i915_gem_free_objects:4793 GEM_BUG_ON(i915_gem_object_is_active(obj))

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/20180505091014.26126-2-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2018-05-05 10:10:14 +01:00
parent 98dc0454c0
commit 7c2f5bc5f0
1 changed files with 3 additions and 0 deletions

View File

@ -23,6 +23,7 @@
*/
#include "../i915_selftest.h"
#include "igt_flush_test.h"
#include "mock_drm.h"
#include "huge_gem_object.h"
@ -411,6 +412,8 @@ static int igt_ctx_exec(void *arg)
}
out_unlock:
if (igt_flush_test(i915, I915_WAIT_LOCKED))
err = -EIO;
mutex_unlock(&i915->drm.struct_mutex);
mock_file_free(i915, file);