[PATCH 11/19] drm/i915: Move terminally wedged check earlier during GEM init

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Driver being terminally wedged is not part of hardware initialisation so
move it from i915_gem_init_hw to i915_gem_init.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 8eee9ecf0adf..ca53bbee3d29 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1278,11 +1278,6 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)
 	 */
 	init_unused_rings(dev_priv);
 
-	BUG_ON(!dev_priv->kernel_context);
-	ret = i915_terminally_wedged(dev_priv);
-	if (ret)
-		goto out;
-
 	ret = i915_ppgtt_init_hw(dev_priv);
 	if (ret) {
 		DRM_ERROR("Enabling PPGTT failed (%d)\n", ret);
@@ -1559,6 +1554,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
 		GEM_BUG_ON(ret == -EIO);
 		goto err_scratch;
 	}
+	BUG_ON(!dev_priv->kernel_context);
 
 	ret = intel_engines_init(dev_priv);
 	if (ret) {
@@ -1578,6 +1574,10 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
 	if (ret)
 		goto err_uc_init;
 
+	ret = i915_terminally_wedged(dev_priv);
+	if (ret)
+		goto err_init_hw;
+
 	/*
 	 * Despite its name intel_init_clock_gating applies both display
 	 * clock gating workarounds; GT mmio workarounds and the occasional
-- 
2.20.1