| Message ID | 20200615183935.17389-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/gt: Don't flush the tasklet if not setup | expand |
Chris Wilson <chris@chris-wilson.co.uk> writes: > 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 <chris@chris-wilson.co.uk> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > 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); > > -- > 2.20.1
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);
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 <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +++ 1 file changed, 3 insertions(+)