drm/i915/guc: Disable send function on fini
authorMichal Wajdeczko <michal.wajdeczko@intel.com>
Fri, 26 May 2017 11:13:24 +0000 (11:13 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 26 May 2017 12:26:53 +0000 (13:26 +0100)
In earlier patch 789a625 we were enabling send function only
after successful init. For completeness, we should make sure
that we disable it on fini.

v2: don't group steps by submission flag (Chris)

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170526111326.87280-2-michal.wajdeczko@intel.com
drivers/gpu/drm/i915/intel_uc.c

index d27b5277901c33a686f45ece5c4e5361d1ebdf67..31dc8c3444cd99d27b27a5037668355a1a262db3 100644 (file)
@@ -410,11 +410,16 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
        if (!i915.enable_guc_loading)
                return;
 
-       if (i915.enable_guc_submission) {
+       if (i915.enable_guc_submission)
                i915_guc_submission_disable(dev_priv);
+
+       guc_disable_communication(&dev_priv->guc);
+
+       if (i915.enable_guc_submission) {
                gen9_disable_guc_interrupts(dev_priv);
                i915_guc_submission_fini(dev_priv);
        }
+
        i915_ggtt_disable_guc(dev_priv);
 }