drm/i915: fixup hangman rebase goof-up

[~andy/linux] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 238a521658330bbf7468b95b351148436d383602..e41aadef99378282a9bd49dbc9a1f4aee1277cb6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -799,7 +799,7 @@ static int gen6_do_reset(struct drm_device *dev)
        return ret;
 }
 
-static int intel_gpu_reset(struct drm_device *dev)
+int intel_gpu_reset(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        int ret = -ENODEV;
@@ -860,8 +860,6 @@ int i915_reset(struct drm_device *dev)
        if (!mutex_trylock(&dev->struct_mutex))
                return -EBUSY;
 
-       dev_priv->stop_rings = 0;
-
        i915_gem_reset(dev);
 
        ret = -ENODEV;
@@ -903,6 +901,7 @@ int i915_reset(struct drm_device *dev)
                for_each_ring(ring, dev_priv, i)
                        ring->init(ring);
 
+               i915_gem_context_init(dev);
                i915_gem_init_ppgtt(dev);
 
                mutex_unlock(&dev->struct_mutex);