From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 11/19] drm/i915: interrupt & vblank support
	for Ivy Bridge
Date: Tue, 28 Jun 2011 11:55:42 +0100
Message-ID: <1309258540_33532@CP5-2952>
References: <1304028785-10583-1-git-send-email-jbarnes@virtuousgeek.org>
	<1304028785-10583-12-git-send-email-jbarnes@virtuousgeek.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from fireflyinternet.com (server109-228-6-236.live-servers.net
	[109.228.6.236])
	by gabe.freedesktop.org (Postfix) with ESMTP id D32BD9E77E
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 28 Jun 2011 03:55:45 -0700 (PDT)
In-Reply-To: <1304028785-10583-12-git-send-email-jbarnes@virtuousgeek.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Jesse Barnes <jbarnes@virtuousgeek.org>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Thu, 28 Apr 2011 15:12:57 -0700, Jesse Barnes <jbarnes@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