Skip to content

Commit

Permalink
drm/i915: switch order of power domain init wrt. irq install
Browse files Browse the repository at this point in the history
On VLV at least the display IRQ register access and functionality
depends on its power well to be on, so move the power domain HW init
before we install the IRQs.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Imre Deak authored and Daniel Vetter committed Mar 5, 2014
1 parent da7e29b commit e13192f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/i915_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1321,12 +1321,12 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (ret)
goto cleanup_vga_switcheroo;

intel_power_domains_init_hw(dev_priv);

ret = drm_irq_install(dev);
if (ret)
goto cleanup_gem_stolen;

intel_power_domains_init_hw(dev_priv);

/* Important: The output setup functions called by modeset_init need
* working irqs for e.g. gmbus and dp aux transfers. */
intel_modeset_init(dev);
Expand Down

0 comments on commit e13192f

Please sign in to comment.