| commit | f4ea6bddb9988e7aa6f50732c75739e8cd7c2582 | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Tue Aug 02 22:50:32 2016 +0100 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Tue Aug 02 22:58:27 2016 +0100 |
| tree | ee80af5f2be8c8da1e0adcc3caaa80fcd030b7a9 | |
| parent | ddd66c5154c25dcb78e3ca29baa0d16cf2c8d6fb [diff] [blame] |
drm/i915/lrc: Update function names to match request flow With adding engine->submit_request, we now have a bunch of functions with similar names used at different stages of the execlist submission. Try a different coat of paint, to hopefully reduce confusion between the requests, intel_engine_cs and the actual execlists submision process. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1469432687-22756-24-git-send-email-chris@chris-wilson.co.uk Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1470174640-18242-15-git-send-email-chris@chris-wilson.co.uk
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index 5de8675..c9105f6 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -1019,11 +1019,11 @@ if (!guc->execbuf_client) return; - guc_client_free(dev_priv, guc->execbuf_client); - guc->execbuf_client = NULL; - /* Revert back to manual ELSP submission */ intel_execlists_enable_submission(dev_priv); + + guc_client_free(dev_priv, guc->execbuf_client); + guc->execbuf_client = NULL; } void i915_guc_submission_fini(struct drm_i915_private *dev_priv)