From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Ringbuffer signal func for the second BSD ring Date: Mon, 12 May 2014 21:04:07 +0200 Message-ID: <20140512190407.GG25056@phenom.ffwll.local> References: <1399639499-5265-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by gabe.freedesktop.org (Postfix) with ESMTP id A76626E954 for ; Mon, 12 May 2014 12:04:12 -0700 (PDT) Received: by mail-ee0-f42.google.com with SMTP id d49so5043066eek.29 for ; Mon, 12 May 2014 12:04:11 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1399639499-5265-1-git-send-email-oscar.mateo@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: oscar.mateo@intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, May 09, 2014 at 01:44:59PM +0100, oscar.mateo@intel.com wrote: > From: Oscar Mateo > > This is missing in: > > commit 78325f2d270897c9ee0887125b7abb963eb8efea > Author: Ben Widawsky > Date: Tue Apr 29 14:52:29 2014 -0700 > > drm/i915: Virtualize the ringbuffer signal func > > Looks to me like a rebase side-effect... > > Signed-off-by: Oscar Mateo Queued for -next, thanks for the patch. Iirc there's been a regression report too. Anyone know the bugzilla? -Daniel > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 9907d66..203fa2b 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -2182,6 +2182,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) > ring->dispatch_execbuffer = > gen8_ring_dispatch_execbuffer; > ring->semaphore.sync_to = gen6_ring_sync; > + ring->semaphore.signal = gen6_signal; > /* > * The current semaphore is only applied on the pre-gen8. And there > * is no bsd2 ring on the pre-gen8. So now the semaphore_register > -- > 1.9.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch