drm/i915: Reset tasklet back to execlists after disabling guc
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 18 Mar 2017 10:28:59 +0000 (10:28 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 20 Mar 2017 10:13:14 +0000 (10:13 +0000)
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>
Link: http://patchwork.freedesktop.org/patch/msgid/20170318102859.24101-1-chris@chris-wilson.co.uk
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
drivers/gpu/drm/i915/intel_lrc.c

index 77168e673e0a18aff69ba8b7a62b70cfea01af94..dab73e7d9a6bff488a29eed83347e73f8abf1a32 100644 (file)
@@ -1575,6 +1575,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