Skip to content

Commit

Permalink
drm/i915: Pull intel_init_power_well() out of intel_modeset_init_hw()
Browse files Browse the repository at this point in the history
The init and resume codepaths want to handel the power well in slightly
different ways, so pull the power well init out from
intel_modeset_init_hw() which gets called in both cases.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Ville Syrjälä authored and Daniel Vetter committed Sep 20, 2013
1 parent cdf8dd7 commit d631729
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1324,6 +1324,8 @@ static int i915_load_modeset_init(struct drm_device *dev)

INIT_WORK(&dev_priv->console_resume_work, intel_console_resume);

intel_init_power_well(dev);

intel_modeset_gem_init(dev);

/* Always safe in the mode setting case. */
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
/* We need working interrupts for modeset enabling ... */
drm_irq_install(dev);

intel_init_power_well(dev);

intel_modeset_init_hw(dev);

drm_modeset_lock_all(dev);
Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -10273,8 +10273,6 @@ static void i915_enable_vga(struct drm_device *dev)

void intel_modeset_init_hw(struct drm_device *dev)
{
intel_init_power_well(dev);

intel_prepare_ddi(dev);

intel_init_clock_gating(dev);
Expand Down

0 comments on commit d631729

Please sign in to comment.