aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-09-27 01:24:57 -0400
committerKeith Packard <keithp@keithp.com>2011-09-28 17:08:38 -0400
commit9fb526db979581841227e1ed4f75a5fbe853db4a (patch)
treeb4171d88d0d535f178ca33787556246c502f7c90 /drivers/gpu/drm/i915/i915_drv.c
parentafffb9dfb62a9eb2a6e467a3875907189e49a2d2 (diff)
drm/i915: Initialize PCH refclks at modeset init time
The reference clock configuration must be done before any mode setting can occur as all outputs must be disabled to change anything. Initialize the clocks after turning everything off during the initialization process. Also, re-initialize the refclk at resume time. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 58480deacc07..2b6c2d2f223b 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -471,6 +471,9 @@ static int i915_drm_thaw(struct drm_device *dev)
471 error = i915_gem_init_ringbuffer(dev); 471 error = i915_gem_init_ringbuffer(dev);
472 mutex_unlock(&dev->struct_mutex); 472 mutex_unlock(&dev->struct_mutex);
473 473
474 if (HAS_PCH_SPLIT(dev))
475 ironlake_init_pch_refclk(dev);
476
474 drm_mode_config_reset(dev); 477 drm_mode_config_reset(dev);
475 drm_irq_install(dev); 478 drm_irq_install(dev);
476 479