| Message ID | 20180404210724.3416-6-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c index 9712123..0facfd2 100644 --- a/drivers/gpu/drm/i915/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/intel_guc_submission.c @@ -1261,13 +1261,9 @@ void intel_guc_submission_disable(struct intel_guc *guc) { struct drm_i915_private *dev_priv = guc_to_i915(guc); - GEM_BUG_ON(dev_priv->gt.awake); /* GT should be parked first */ - + intel_engines_reset_default_submission(dev_priv); guc_interrupts_release(dev_priv); guc_clients_doorbell_fini(guc); - - /* Revert back to manual ELSP submission */ - intel_engines_reset_default_submission(dev_priv); } #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
In next patch we will also try to disable GuC submission during reset path, where where we don't wait for idle_work to complete. Remove GEM_BUG_ON to allow new scenario. While here fix order to match symmetry with enable function. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_guc_submission.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)