Merge tag 'v4.4-rc2' into drm-intel-next-queued

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / intel_uncore.c

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 2f0a861..c2358ba 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1564,13 +1564,22 @@ static int (*intel_get_gpu_reset(struct drm_device *dev))(struct drm_device *)
 
 int intel_gpu_reset(struct drm_device *dev)
 {
+       struct drm_i915_private *dev_priv = to_i915(dev);
        int (*reset)(struct drm_device *);
+       int ret;
 
        reset = intel_get_gpu_reset(dev);
        if (reset == NULL)
                return -ENODEV;
 
-       return reset(dev);
+       /* If the power well sleeps during the reset, the reset
+        * request may be dropped and never completes (causing -EIO).
+        */
+       intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
+       ret = reset(dev);
+       intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+
+       return ret;
 }
 
 bool intel_has_gpu_reset(struct drm_device *dev)