[Intel-gfx] [PATCH 11/19] drm/i915: interrupt & vblank support for Ivy Bridge

[Chris Wilson]

On Thu, 28 Apr 2011 15:12:57 -0700, Jesse Barnes <jbarnes at virtuousgeek.org> wrote:
> Add new interrupt handling functions for Ivy Bridge.

There's a slight discrepancy here:

> +	if (IS_IVYBRIDGE(dev)) {
> +		/* Share pre & uninstall handlers with ILK/SNB */
> +		dev->driver->irq_handler = ivybridge_irq_handler;
> +		dev->driver->irq_preinstall = ironlake_irq_preinstall;
> +		dev->driver->irq_postinstall = ivybridge_irq_postinstall;
> +		dev->driver->irq_uninstall = ironlake_irq_uninstall;
> +		dev->driver->enable_vblank = ivybridge_enable_vblank;
> +		dev->driver->disable_vblank = ivybridge_disable_vblank;

and later you say:

> +extern irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS);
> +extern void ivybridge_irq_preinstall(struct drm_device *dev);
> +extern int ivybridge_irq_postinstall(struct drm_device *dev);
> +extern void ivybridge_irq_uninstall(struct drm_device *dev);

Can you please tidy up this latter bit of copy'n'paste, it scared me
whilst running git grep ;-)

I'd like to move those declarations out of the header, make the functions
static and just export a single function from i915_irq.c to i915_dma.c that
set the irq_handlers on the driver vfunc table and so prevent the
possibility of any further confusion like Konstantin pointed out.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre