Commit e13192f6 authored Feb 18, 2014 by Imre Deak Committed by Daniel Vetter Mar 05, 2014

drm/i915: switch order of power domain init wrt. irq install



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>

parent da7e29bd

drivers/gpu/drm/i915/i915_dma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);