[Intel-gfx] [PATCH 1/3] drm/i915: Cancel the hotplug re-enable timer on BDW

[Chris Wilson]

On Fri, Jan 17, 2014 at 11:35:14AM +0200, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> We forgot to cancel the hotplug re-enable timer in gen8_irq_uninstall().
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 6d11e25..fa2b6cf 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3001,6 +3001,8 @@ static void gen8_irq_uninstall(struct drm_device *dev)
>  	if (!dev_priv)
>  		return;
>  
> +	del_timer_sync(&dev_priv->hotplug_reenable_timer);

I'd rather this was

intel_hpd_irq_uninstall(struct drm_device *dev)
{
	del_timer_sync(&to_i915(dev)->hotplug_reenable_timer);
}

that each genX_irq_uninstall() routine called.
And s/i915_reenable_hotplug_timer_func/intel_hpd_irq_reenable/
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre