[PATCH 1/3] drm/i915: Return init_power

[Chris Wilson]

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_display.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 53e7a7e75384..e52b94ddbef1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15206,8 +15206,10 @@ int intel_modeset_init(struct drm_device *dev)
 
 	intel_init_pm(dev_priv);
 
-	if (INTEL_INFO(dev_priv)->num_pipes == 0)
+	if (INTEL_INFO(dev_priv)->num_pipes == 0) {
+		intel_display_set_init_power(dev_priv, false);
 		return 0;
+	}
 
 	/*
 	 * There may be no VBT; and if the BIOS enabled SSC we can
@@ -15260,6 +15262,7 @@ int intel_modeset_init(struct drm_device *dev)
 		ret = intel_crtc_init(dev_priv, pipe);
 		if (ret) {
 			drm_mode_config_cleanup(dev);
+			intel_display_set_init_power(dev_priv, false);
 			return ret;
 		}
 	}
-- 
2.18.0