1 files changed, 0 insertions, 14 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3fa3eae0ee06..5c66b568bb81 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1199,21 +1199,7 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool force_on)
         u32 val;
         int err;
 
-        val = I915_READ(VLV_GTLC_SURVIVABILITY_REG);
-
 #define COND (I915_READ(VLV_GTLC_SURVIVABILITY_REG) & VLV_GFX_CLK_STATUS_BIT)
-        /* Wait for a previous force-off to settle */
-        if (force_on && !IS_CHERRYVIEW(dev_priv->dev)) {
-                /* WARN_ON only for the Valleyview */
-                WARN_ON(!!(val & VLV_GFX_CLK_FORCE_ON_BIT) == force_on);
-
-                err = wait_for(!COND, 20);
-                if (err) {
-                        DRM_ERROR("timeout waiting for GFX clock force-off (%08x)\n",
-                                  I915_READ(VLV_GTLC_SURVIVABILITY_REG));
-                        return err;
-                }
-        }
 
         val = I915_READ(VLV_GTLC_SURVIVABILITY_REG);
         val &= ~VLV_GFX_CLK_FORCE_ON_BIT;