[Intel-gfx] [PATCH 4/9] drm/i915: split i915_driver_modeset_remove() to pre/post irq uninstall

[Ville Syrjälä]

On Tue, Feb 04, 2020 at 03:42:23PM +0200, Jani Nikula wrote:
> Push irq uninstall further up, by splitting i915_driver_modeset_remove()
> to two, the part with working irqs before irq uninstall, and the part
> after irq uninstall. No functional changes.
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 5330a0f10e97..2ef4b8fc5f4c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -345,12 +345,15 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
>  	return ret;
>  }
>  
> +/* part #1: call before irq uninstall */
>  static void i915_driver_modeset_remove(struct drm_i915_private *i915)
>  {
>  	intel_modeset_driver_remove(i915);
> +}

I wonder if we can remove some layers of this cake eventually.

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

>  
> -	intel_irq_uninstall(i915);
> -
> +/* part #2: call after irq uninstall */
> +static void i915_driver_modeset_remove_noirq(struct drm_i915_private *i915)
> +{
>  	intel_modeset_driver_remove_noirq(i915);
>  
>  	intel_bios_driver_remove(i915);
> @@ -1591,6 +1594,10 @@ void i915_driver_remove(struct drm_i915_private *i915)
>  
>  	i915_driver_modeset_remove(i915);
>  
> +	intel_irq_uninstall(i915);
> +
> +	i915_driver_modeset_remove_noirq(i915);
> +
>  	i915_reset_error_state(i915);
>  	i915_gem_driver_remove(i915);
>  
> -- 
> 2.20.1

-- 
Ville Syrjälä
Intel