Merge tag 'afs-next-20180208' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 8bc3283484be22583df553842c45ef47d0bc9f37..dd89abd2263d20334403ae4c4b1ef61af5482135 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3323,16 +3323,15 @@ i915_gem_retire_work_handler(struct work_struct *work)
                mutex_unlock(&dev->struct_mutex);
        }
 
-       /* Keep the retire handler running until we are finally idle.
+       /*
+        * Keep the retire handler running until we are finally idle.
         * We do not need to do this test under locking as in the worst-case
         * we queue the retire worker once too often.
         */
-       if (READ_ONCE(dev_priv->gt.awake)) {
-               i915_queue_hangcheck(dev_priv);
+       if (READ_ONCE(dev_priv->gt.awake))
                queue_delayed_work(dev_priv->wq,
                                   &dev_priv->gt.retire_work,
                                   round_jiffies_up_relative(HZ));
-       }
 }
 
 static inline bool
@@ -5283,6 +5282,8 @@ err_unlock:
        intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
        mutex_unlock(&dev_priv->drm.struct_mutex);
 
+       intel_uc_fini_wq(dev_priv);
+
        if (ret != -EIO)
                i915_gem_cleanup_userptr(dev_priv);