drm/i915: Do a fuller init after reset

I had this lying around from he original PPGTT series, and thought we
might try to get it in by itself.

It's convenient to just call i915_gem_init_hw at reset because we'll be
adding new things to that function, and having just one function to call
instead of reimplementing it in two places is nice.

In order to accommodate we cleanup ringbuffers in order to bring them
back up cleanly. Optionally, we could also teardown/re initialize the
default context but this was causing some problems on reset which I
wasn't able to fully debug, and is unnecessary with the previous context
init/enable split.

This essentially reverts:
commit 8e88a2bd5987178d16d53686197404e149e996d9
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Jun 19 18:40:00 2012 +0200

    drm/i915: don't call modeset_init_hw in i915_reset

It seems to work for me on ILK now. Perhaps it's due to:
commit 8a5c2ae753c588bcb2a4e38d1c6a39865dbf1ff3
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Mar 28 13:57:19 2013 -0700

    drm/i915: fix ILK GPU reset for render

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

3 files changed, 13 insertions, 22 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 59649c060986..db84e242306d 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -744,30 +744,17 @@ int i915_reset(struct drm_device *dev)
          */
         if (drm_core_check_feature(dev, DRIVER_MODESET) ||
                         !dev_priv->ums.mm_suspended) {
-                struct intel_ring_buffer *ring;
-                int i;
-
+                bool hw_contexts_disabled = dev_priv->hw_contexts_disabled;
                 dev_priv->ums.mm_suspended = 0;
 
-                i915_gem_init_swizzling(dev);
-
-                for_each_ring(ring, dev_priv, i)
-                        ring->init(ring);
-
-                i915_gem_context_init(dev);
-                if (dev_priv->mm.aliasing_ppgtt) {
-                        ret = dev_priv->mm.aliasing_ppgtt->enable(dev);
-                        if (ret)
-                                i915_gem_cleanup_aliasing_ppgtt(dev);
-                }
-
-                /*
-                 * It would make sense to re-init all the other hw state, at
-                 * least the rps/rc6/emon init done within modeset_init_hw. For
-                 * some unknown reason, this blows up my ilk, so don't.
-                 */
-
+                ret = i915_gem_init_hw(dev);
+                if (!hw_contexts_disabled && dev_priv->hw_contexts_disabled)
+                        DRM_ERROR("HW contexts didn't survive reset\n");
                 mutex_unlock(&dev->struct_mutex);
+                if (ret) {
+                        DRM_ERROR("Failed hw init on reset %d\n", ret);
+                        return ret;
+                }
 
                 drm_irq_uninstall(dev);
                 drm_irq_install(dev);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 71dd0305eb32..1d22c99601ed 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2406,6 +2406,8 @@ void i915_gem_reset(struct drm_device *dev)
         for_each_ring(ring, dev_priv, i)
                 i915_gem_reset_ring_lists(dev_priv, ring);
 
+        i915_gem_cleanup_ringbuffer(dev);
+
         i915_gem_restore_fences(dev);
 }
 
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 4e108fc3c340..2dec134f75eb 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1324,7 +1324,7 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring)
         /* Disable the ring buffer. The ring must be idle at this point */
         dev_priv = ring->dev->dev_private;
         ret = intel_ring_idle(ring);
-        if (ret)
+        if (ret && !i915_reset_in_progress(&dev_priv->gpu_error))
                 DRM_ERROR("failed to quiesce %s whilst cleaning up: %d\n",
                           ring->name, ret);
 
@@ -1335,6 +1335,8 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring)
         i915_gem_object_unpin(ring->obj);
         drm_gem_object_unreference(&ring->obj->base);
         ring->obj = NULL;
+        ring->preallocated_lazy_request = NULL;
+        ring->outstanding_lazy_seqno = 0;
 
         if (ring->cleanup)
                 ring->cleanup(ring);