diff options
| author | Oscar Mateo <oscar.mateo@intel.com> | 2014-05-09 08:44:59 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-13 08:13:24 -0400 |
| commit | d1533379584f8edcfcabb024dffc1b334db8da0f (patch) | |
| tree | 253e315670b3bffe65d4e9a5b5220b058e9f302a /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | 36dfcea47a862421154e9943ada5f8147bcbd43c (diff) | |
drm/i915: Ringbuffer signal func for the second BSD ring
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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 09b6d04be616..3974e827c472 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
| @@ -2186,6 +2186,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) | |||
| 2186 | ring->dispatch_execbuffer = | 2186 | ring->dispatch_execbuffer = |
| 2187 | gen8_ring_dispatch_execbuffer; | 2187 | gen8_ring_dispatch_execbuffer; |
| 2188 | ring->semaphore.sync_to = gen6_ring_sync; | 2188 | ring->semaphore.sync_to = gen6_ring_sync; |
| 2189 | ring->semaphore.signal = gen6_signal; | ||
| 2189 | /* | 2190 | /* |
| 2190 | * The current semaphore is only applied on the pre-gen8. And there | 2191 | * The current semaphore is only applied on the pre-gen8. And there |
| 2191 | * is no bsd2 ring on the pre-gen8. So now the semaphore_register | 2192 | * is no bsd2 ring on the pre-gen8. So now the semaphore_register |