| Message ID | 20170318102859.24101-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Mar 18, 2017 at 10:28:59AM +0000, Chris Wilson wrote: > When switching back to execlists, we also now need to restore the > tasklet handler. > > Reported-by: Oscar Mateo <oscar.mateo@intel.com> > Fixes: 31de73501ac9 ("drm/i915/scheduler: emulate a scheduler for guc") > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Michał Winiarski <michal.winiarski@intel.com> > Cc: Oscar Mateo <oscar.mateo@intel.com> Reviewed-by: Michał Winiarski <michal.winiarski@intel.com> -Michał > --- > drivers/gpu/drm/i915/intel_lrc.c | 1 + > 1 file changed, 1 insertion(+)
On Sun, Mar 19, 2017 at 10:58:12PM +0100, Michał Winiarski wrote: > On Sat, Mar 18, 2017 at 10:28:59AM +0000, Chris Wilson wrote: > > When switching back to execlists, we also now need to restore the > > tasklet handler. > > > > Reported-by: Oscar Mateo <oscar.mateo@intel.com> > > Fixes: 31de73501ac9 ("drm/i915/scheduler: emulate a scheduler for guc") > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Cc: Michał Winiarski <michal.winiarski@intel.com> > > Cc: Oscar Mateo <oscar.mateo@intel.com> > > Reviewed-by: Michał Winiarski <michal.winiarski@intel.com> Idempotency is good. Pushed, thanks. -Chris
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 97dda0108a8c..df1d1c9eeb99 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1578,6 +1578,7 @@ static void execlists_set_default_submission(struct intel_engine_cs *engine) { engine->submit_request = execlists_submit_request; engine->schedule = execlists_schedule; + engine->irq_tasklet.func = intel_lrc_irq_handler; } static void
When switching back to execlists, we also now need to restore the tasklet handler. Reported-by: Oscar Mateo <oscar.mateo@intel.com> Fixes: 31de73501ac9 ("drm/i915/scheduler: emulate a scheduler for guc") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Michał Winiarski <michal.winiarski@intel.com> Cc: Oscar Mateo <oscar.mateo@intel.com> --- drivers/gpu/drm/i915/intel_lrc.c | 1 + 1 file changed, 1 insertion(+)