drm/i915: enable output polling during S4 thaw

[linux-2.6-block.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index d0f721fb25ad7debc110481e37bc0fe1dcd987e2..4524c615f0a70f7c80a21bbfa326fdf59ed33c73 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -752,6 +752,8 @@ static int __i915_drm_thaw(struct drm_device *dev)
 
        intel_opregion_notify_adapter(dev, PCI_D0);
 
+       drm_kms_helper_poll_enable(dev);
+
        return 0;
 }
 
@@ -781,14 +783,7 @@ static int i915_resume_early(struct drm_device *dev)
 
 static int i915_drm_resume(struct drm_device *dev)
 {
-       int ret;
-
-       ret = __i915_drm_thaw(dev);
-       if (ret)
-               return ret;
-
-       drm_kms_helper_poll_enable(dev);
-       return 0;
+       return __i915_drm_thaw(dev);
 }
 
 static int i915_resume_legacy(struct drm_device *dev)