diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 2b5eb229ff2..0c3e3bf67c2 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c | |||
@@ -879,17 +879,7 @@ int i915_restore_state(struct drm_device *dev) | |||
879 | mutex_unlock(&dev->struct_mutex); | 879 | mutex_unlock(&dev->struct_mutex); |
880 | 880 | ||
881 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | 881 | if (drm_core_check_feature(dev, DRIVER_MODESET)) |
882 | intel_init_clock_gating(dev); | 882 | intel_modeset_init_hw(dev); |
883 | |||
884 | if (IS_IRONLAKE_M(dev)) { | ||
885 | ironlake_enable_drps(dev); | ||
886 | intel_init_emon(dev); | ||
887 | } | ||
888 | |||
889 | if (INTEL_INFO(dev)->gen >= 6) { | ||
890 | gen6_enable_rps(dev_priv); | ||
891 | gen6_update_ring_freq(dev_priv); | ||
892 | } | ||
893 | 883 | ||
894 | mutex_lock(&dev->struct_mutex); | 884 | mutex_lock(&dev->struct_mutex); |
895 | 885 | ||