[Intel-gfx] [PATCH] drm/i915: Init power domains early in driver load

[Jani Nikula]

On Thu, 07 Jan 2016, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> Since
>
> commit ac9b8236551d1177fd07b56aef9b565d1864420d
> Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Date:   Fri Nov 27 18:55:26 2015 +0200
>
>     drm/i915: Introduce a gmbus power domain
>
> gmbus also needs the power domain infrastructure right from the start,
> since as soon as we register the i2c controllers someone can use them.
>
> v2: Adjust cleanup paths too (Chris).
>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Patrik Jakobsson <patrik.jakobsson at linux.intel.com>
> Cc: Imre Deak <imre.deak at intel.com>
> Cc: Jani Nikula <jani.nikula at intel.com>
> Cc: Meelis Roos <mroos at linux.ee>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Fixes: ac9b8236551d ("drm/i915: Introduce a gmbus power domain")
> Cc: stable at vger.kernel.org
> References: http://www.spinics.net/lists/intel-gfx/msg83075.html
> Tested-by: Meelis Roos <mroos at linux.ee>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93608

> ---
>  drivers/gpu/drm/i915/i915_dma.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 988a3806512a..490d8b0d931e 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -398,7 +398,6 @@ static int i915_load_modeset_init(struct drm_device *dev)
>  	if (ret)
>  		goto cleanup_vga_switcheroo;
>  
> -	intel_power_domains_init_hw(dev_priv, false);
>  
>  	intel_csr_ucode_init(dev_priv);
>  
> @@ -1025,6 +1024,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
>  
>  	intel_irq_init(dev_priv);
>  	intel_uncore_sanitize(dev);
> +	intel_power_domains_init(dev_priv);
> +	intel_power_domains_init_hw(dev_priv);
>  
>  	/* Try to make sure MCHBAR is enabled before poking at it */
>  	intel_setup_mchbar(dev);
> @@ -1057,12 +1058,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
>  			goto out_gem_unload;
>  	}
>  
> -	intel_power_domains_init(dev_priv);
> -
>  	ret = i915_load_modeset_init(dev);
>  	if (ret < 0) {
>  		DRM_ERROR("failed to init modeset\n");
> -		goto out_power_well;
> +		goto out_vblank;
>  	}
>  
>  	/*
> @@ -1091,8 +1090,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
>  
>  	return 0;
>  
> -out_power_well:
> -	intel_power_domains_fini(dev_priv);
> +out_vblank:
>  	drm_vblank_cleanup(dev);
>  out_gem_unload:
>  	WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));
> @@ -1103,6 +1101,7 @@ out_gem_unload:
>  
>  	intel_teardown_gmbus(dev);
>  	intel_teardown_mchbar(dev);
> +	intel_power_domains_fini(dev_priv);
>  	pm_qos_remove_request(&dev_priv->pm_qos);
>  	destroy_workqueue(dev_priv->gpu_error.hangcheck_wq);
>  out_freedpwq:

-- 
Jani Nikula, Intel Open Source Technology Center