From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 14/14] drm/i915: inline enable/disable_irq into ring->get/put_irq Date: Fri, 13 Apr 2012 10:17:36 +0100 Message-ID: <1334308664_404842@CP5-2952> References: <1334175179-1514-1-git-send-email-daniel.vetter@ffwll.ch> <1334175179-1514-15-git-send-email-daniel.vetter@ffwll.ch> <20120412180330.60e1f99b@bwidawsk.net> <20120413091353.GD4525@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id E65CB9E7D0 for ; Fri, 13 Apr 2012 02:17:48 -0700 (PDT) In-Reply-To: <20120413091353.GD4525@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Daniel Vetter , Ben Widawsky Cc: Daniel Vetter , Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Fri, 13 Apr 2012 11:13:53 +0200, Daniel Vetter wrote: > On Thu, Apr 12, 2012 at 06:03:30PM -0700, Ben Widawsky wrote: > > On Wed, 11 Apr 2012 22:12:59 +0200 > > Daniel Vetter wrote: > > > > > Now that these are properly refactored this additional indirection > > > doesn't really buy us anything but confusion. Hence inline them. > > > > > > This duplicates the ironlake gt enable/disable code snippet, but we've > > > already separate ilk from gen6+ gt irq in i915_irq.c, so I think this > > > makes more sense. > > > > > > Signed-Off-by: Daniel Vetter > > > > Bikeshed: > > While doing all this, I think put/get irq is really terribly named. I > > was a much bigger fan of the enable disable. > > Actually that can be combined with Chris' bikeshed to move the > ring->put|get_irg to dev_priv->core.ring_enable/disable_irq. But I've > figured that the same patch series should also move the forcewake function > pointers from dev_priv->display to dev_priv->core, so this is imo a > different patch series. Not quite, they are get/put functions, as we do have multiple waiters sharing the irq. -Chris -- Chris Wilson, Intel Open Source Technology Centre