[Intel-gfx] [PATCH] drm/i915: don't trigger ironlake vblank interrupt at irq install

[Zhenyu Wang]

On 2010.01.28 01:05:09 +0800, Li Peng wrote:
> Zhenyu noticed that the ironlake vblank enabling patch has one
> issue that it will trigger vblank starting from irq postinstall,
> this isn't necessary. This patch addresses this issue by only
> adding the vblank into DEIER but mask them in DEIMR, so that it
> won't trigger vblank interrupt at irq install.
> 
> Signed-off-by: Li Peng <peng.li at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index e7472d8..fcd87ad 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1022,14 +1022,13 @@ static int ironlake_irq_postinstall(struct drm_device *dev)
>  {
>  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
>  	/* enable kind of interrupts always enabled */
> -	u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT |
> -			   DE_PIPEA_VBLANK | DE_PIPEB_VBLANK;
> +	u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT;
>  	u32 render_mask = GT_USER_INTERRUPT;
>  	u32 hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG |
>  			   SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG;
>  
>  	dev_priv->irq_mask_reg = ~display_mask;
> -	dev_priv->de_irq_enable_reg = display_mask;
> +	dev_priv->de_irq_enable_reg = display_mask | DE_PIPEA_VBLANK | DE_PIPEB_VBLANK;
>  
>  	/* should always can generate irq */
>  	I915_WRITE(DEIIR, I915_READ(DEIIR));
> -- 

It seems we could split the enable and mask bits for making things clear, like
for vblank, page flip event, etc. but this is good to me now. thanks.

Acked-by: Zhenyu Wang <zhenyuw at linux.intel.com>

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20100128/5d42a630/attachment.sig>