Skip to content

Commit

Permalink
drm/i915/selftests: Always call the provided engine->emit_init_breadc…
Browse files Browse the repository at this point in the history
…rumb

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
  • Loading branch information
Chris Wilson committed May 14, 2020
1 parent 7a0ba6b commit ed610f4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/selftests/i915_perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/selftests/igt_spinner.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ed610f4

Please sign in to comment.