Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd39ec5d authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Move load time IRQ SW init earlier 



Most of the IRQ init is setting up hooks so move that part earlier.
Leave the pm_qos_add_request() call in place.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-4-git-send-email-imre.deak@intel.com
parent 861f878e

drivers/gpu/drm/i915/i915_dma.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1026,6 +1026,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	intel_pm_setup(dev);

	intel_pm_setup(dev);

	intel_init_dpio(dev_priv);

	intel_init_dpio(dev_priv);

	intel_power_domains_init(dev_priv);

	intel_power_domains_init(dev_priv);

	intel_irq_init(dev_priv);





	intel_runtime_pm_get(dev_priv);

	intel_runtime_pm_get(dev_priv);
@@ -1100,7 +1101,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	dev_priv->gtt.mtrr = arch_phys_wc_add(dev_priv->gtt.mappable_base,

	dev_priv->gtt.mtrr = arch_phys_wc_add(dev_priv->gtt.mappable_base,

					      aperture_size);

					      aperture_size);





	intel_irq_init(dev_priv);

	pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY,

			   PM_QOS_DEFAULT_VALUE);



	intel_uncore_sanitize(dev);

	intel_uncore_sanitize(dev);





	intel_opregion_setup(dev);

	intel_opregion_setup(dev);

drivers/gpu/drm/i915/i915_irq.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -4565,8 +4565,6 @@ void intel_irq_init(struct drm_i915_private *dev_priv) 
	INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,

	INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,

			  i915_hangcheck_elapsed);

			  i915_hangcheck_elapsed);





	pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE);



	if (IS_GEN2(dev_priv)) {

	if (IS_GEN2(dev_priv)) {

		dev->max_vblank_count = 0;

		dev->max_vblank_count = 0;

		dev->driver->get_vblank_counter = i8xx_get_vblank_counter;

		dev->driver->get_vblank_counter = i8xx_get_vblank_counter;