Merge remote-tracking branch 'aosp/android-4.9' into kernel-4.9

[android-x86/kernel.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 1771bde..ab4bb12 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1707,6 +1707,8 @@ static int i915_drm_resume_early(struct drm_device *dev)
        if (IS_BROXTON(dev_priv) ||
            !(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload))
                intel_power_domains_init_hw(dev_priv, true);
+       else
+               intel_display_set_init_power(dev_priv, true);
 
        enable_rpm_wakeref_asserts(dev_priv);