From 570af07d794fc746c42f0aeaaa82362416f33a54 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 15 Jun 2020 19:39:35 +0100 Subject: [PATCH] drm/i915/gt: Don't flush the tasklet if not setup If the tasklet is not being used, don't try and flush it. Fixes: 594893870044 ("drm/i915/gt: Add a safety submission flush in the heartbeat") Signed-off-by: Chris Wilson Cc: Mika Kuoppala Reviewed-by: Mika Kuoppala Link: https://patchwork.freedesktop.org/patch/msgid/20200615183935.17389-1-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index 31049e0bdb57..045179c65c44 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -1094,6 +1094,9 @@ void intel_engine_flush_submission(struct intel_engine_cs *engine) { struct tasklet_struct *t = &engine->execlists.tasklet; + if (!t->func) + return; + /* Synchronise and wait for the tasklet on another CPU */ tasklet_kill(t); -- GitLab