drm/i915: Implement GPU reset on i965

This patch puts in place the machinery to attempt to reset the GPU. This
will be used when attempting to recover from a GPU hang.

Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 08a5048335e1..f47adb4aa59a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1173,6 +1173,9 @@ static int i915_load_modeset_init(struct drm_device *dev,
         drm_mm_init(&dev_priv->vram, 0, prealloc_size);
         DRM_INFO("set up %ldM of stolen space\n", prealloc_size / (1024*1024));
 
+        /* We're off and running w/KMS */
+        dev_priv->mm.suspended = 0;
+
         /* Let GEM Manage from end of prealloc space to end of aperture.
          *
          * However, leave one page at the end still bound to the scratch page.
@@ -1184,7 +1187,9 @@ static int i915_load_modeset_init(struct drm_device *dev,
          */
         i915_gem_do_init(dev, prealloc_size, agp_size - 4096);
 
+        mutex_lock(&dev->struct_mutex);
         ret = i915_gem_init_ringbuffer(dev);
+        mutex_unlock(&dev->struct_mutex);
         if (ret)
                 goto out;
 
@@ -1433,6 +1438,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
                 return ret;
         }
 
+        /* Start out suspended */
+        dev_priv->mm.suspended = 1;
+
         if (drm_core_check_feature(dev, DRIVER_MODESET)) {
                 ret = i915_load_modeset_init(dev, prealloc_start,
                                              prealloc_size, agp_size);