summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2012-07-06 15:42:36 -0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-20 12:21:36 +0200
commit0232e927f8b0b37f5c82648f9bc45e55fb245068 (patch)
tree36a413a56c16a821cb631df331e4d95e739815d3 /drivers/gpu/drm/i915/intel_display.c
parentff9282613f6796db3fe85dc6cbb995223078f581 (diff)
downloadlwn-0232e927f8b0b37f5c82648f9bc45e55fb245068.tar.gz
lwn-0232e927f8b0b37f5c82648f9bc45e55fb245068.zip
drm/i915: initialize power wells in modeset_init_hw
This initializes power wells within the modeset_init_hw routine. Testing has shown that this works for both driver load time and for suspend-resume code paths. Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0972f49e15d8..80fe02d2d733 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7187,6 +7187,11 @@ static void ivb_pch_pwm_override(struct drm_device *dev)
void intel_modeset_init_hw(struct drm_device *dev)
{
+ /* We attempt to init the necessary power wells early in the initialization
+ * time, so the subsystems that expect power to be enabled can work.
+ */
+ intel_init_power_wells(dev);
+
intel_prepare_ddi(dev);
intel_init_clock_gating(dev);