| Message ID | 1399639499-5265-1-git-send-email-oscar.mateo@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 09, 2014 at 01:44:59PM +0100, oscar.mateo@intel.com wrote: > From: Oscar Mateo <oscar.mateo@intel.com> > > This is missing in: > > commit 78325f2d270897c9ee0887125b7abb963eb8efea > Author: Ben Widawsky <benjamin.widawsky@intel.com> > 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 <oscar.mateo@intel.com> 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
On Mon, 2014-05-12 at 13:04 -0600, Daniel Vetter wrote: > On Fri, May 09, 2014 at 01:44:59PM +0100, oscar.mateo@intel.com wrote: > > From: Oscar Mateo <oscar.mateo@intel.com> > > > > This is missing in: > > > > commit 78325f2d270897c9ee0887125b7abb963eb8efea > > Author: Ben Widawsky <benjamin.widawsky@intel.com> > > 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 <oscar.mateo@intel.com> > > Queued for -next, thanks for the patch. Iirc there's been a regression > report too. Anyone know the bugzilla? It seems that this patch can fix the issue in: https://bugs.freedesktop.org/show_bug.cgi?id=78274 Thanks. Yakui > -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 >
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