drm/i915/selftests: Always call the provided engine->emit_init_breadcrumb

While this does not appear to fix any issues, the backend itself knows
when it wants to emit a breadcrumb, so let it make the final call.

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/20200513074809.18194-16-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
index 5608fab98d5db480b224d577802608d141767e30..ca0c9dbab71324795b7b2378b8a33f1627590b48 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_perf.c
+++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
@@ -221,8 +221,7 @@ static int live_noa_delay(void *arg)
                goto out;
        }
 
-       if (rq->engine->emit_init_breadcrumb &&
-           i915_request_timeline(rq)->has_initial_breadcrumb) {
+       if (rq->engine->emit_init_breadcrumb) {
                err = rq->engine->emit_init_breadcrumb(rq);
                if (err) {
                        i915_request_add(rq);

diff --git a/drivers/gpu/drm/i915/selftests/igt_spinner.c b/drivers/gpu/drm/i915/selftests/igt_spinner.c
index 9ad4ab088466daa1a5fad20c34f7eee6b9c5c77e..e35ba5f9e73f662c1b35af5bade8eaa565706308 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/igt_spinner.c
+++ b/drivers/gpu/drm/i915/selftests/igt_spinner.c
@@ -169,8 +169,7 @@ igt_spinner_create_request(struct igt_spinner *spin,
 
        intel_gt_chipset_flush(engine->gt);
 
-       if (engine->emit_init_breadcrumb &&
-           i915_request_timeline(rq)->has_initial_breadcrumb) {
+       if (engine->emit_init_breadcrumb) {
                err = engine->emit_init_breadcrumb(rq);
                if (err)
                        goto cancel_rq;