[Intel-gfx] [PATCH] drm/i915: Restore resume irq ordering comment

Jesse Barnes jbarnes at virtuousgeek.org
Mon Sep 8 18:44:19 CEST 2014


On Mon,  8 Sep 2014 18:28:20 +0200
Daniel Vetter <daniel.vetter at ffwll.ch> wrote:

> This was lost in
> 
> commit e11aa362308f5de467ce355a2a2471321b15a35c
> Author: Jesse Barnes <jbarnes at virtuousgeek.org>
> Date:   Wed Jun 18 09:52:55 2014 -0700
> 
>     drm/i915: use runtime irq suspend/resume in freeze/thaw
> 
> which makes the second part of this commen a bit nonsense. Both were
> originally added in
> 
> commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Tue Mar 5 09:50:58 2013 +0100
> 
>     drm/i915: enable irqs earlier when resuming
> 
> Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
> Cc: Imre Deak <imre.deak at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 70cc38924040..8aaa6e46b989 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -680,6 +680,7 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
>  		}
>  		mutex_unlock(&dev->struct_mutex);
>  
> +		/* We need working interrupts for modeset enabling ... */
>  		intel_runtime_pm_restore_interrupts(dev);
>  
>  		intel_modeset_init_hw(dev);

Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center



More information about the Intel-gfx mailing list