[Intel-gfx] [PATCH] drm/i915: Allow the module to load even if we fail to setup rings

[Chris Wilson]

Even without enabling the ringbuffers to allow command execution, we can
still control the display engines to enable modesetting. So make the
ringbuffer initialization failure soft, and mark the GPU as wedged
instead.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 4f71125493fd..85487b6f6209 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4685,14 +4685,9 @@ int i915_gem_init(struct drm_device *dev)
 		return ret;
 	}
 
-	ret = i915_gem_init_hw(dev);
+	if (i915_gem_init_hw(dev))
+		atomic_set_mask(I915_WEDGED, &dev_priv->gpu_error.reset_counter);
 	mutex_unlock(&dev->struct_mutex);
-	if (ret) {
-		WARN_ON(dev_priv->mm.aliasing_ppgtt);
-		i915_gem_context_fini(dev);
-		drm_mm_takedown(&dev_priv->gtt.base.mm);
-		return ret;
-	}
 
 	/* Allow hardware batchbuffers unless told otherwise, but not for KMS. */
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
-- 
1.9.1