drm/i915: Move intel_init_clock_gating() to i915_gem_init()

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 2148ffbdb0126291fdba7cf21fe9e9eedefccc27..62752d3bf5be4a9b1e57191b002166ffada00e3d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -5023,6 +5023,21 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
        intel_init_gt_powersave(dev_priv);
 
        ret = i915_gem_init_hw(dev_priv);
+       if (ret)
+               goto out_unlock;
+
+       /*
+        * Despite its name intel_init_clock_gating applies both display
+        * clock gating workarounds; GT mmio workarounds and the occasional
+        * GT power context workaround. Worse, sometimes it includes a context
+        * register workaround which we need to apply before we record the
+        * default HW state for all contexts.
+        *
+        * FIXME: break up the workarounds and apply them at the right time!
+        */
+       intel_init_clock_gating(dev_priv);
+
+out_unlock:
        if (ret == -EIO) {
                mutex_lock(&dev_priv->drm.struct_mutex);
 
@@ -5043,8 +5058,6 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
 
                mutex_unlock(&dev_priv->drm.struct_mutex);
        }
-
-out_unlock:
        intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
        mutex_unlock(&dev_priv->drm.struct_mutex);