mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
drm/i915: Virtualize the ringbuffer signal func
This abstraction again is in preparation for gen8. Gen8 will bring new semantics for doing this operation. While here, make the writes of MI_NOOPs explicit for non-existent rings. This should have been implicit before. NOTE: This is going to be removed in a few patches. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
ebc348b2ad
commit
78325f2d27
2 changed files with 32 additions and 21 deletions
|
@ -663,20 +663,32 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring)
|
||||||
ring->scratch.obj = NULL;
|
ring->scratch.obj = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void gen6_signal(struct intel_ring_buffer *signaller)
|
||||||
update_mboxes(struct intel_ring_buffer *ring,
|
|
||||||
u32 mmio_offset)
|
|
||||||
{
|
{
|
||||||
|
struct drm_i915_private *dev_priv = signaller->dev->dev_private;
|
||||||
|
struct intel_ring_buffer *useless;
|
||||||
|
int i;
|
||||||
|
|
||||||
/* NB: In order to be able to do semaphore MBOX updates for varying number
|
/* NB: In order to be able to do semaphore MBOX updates for varying number
|
||||||
* of rings, it's easiest if we round up each individual update to a
|
* of rings, it's easiest if we round up each individual update to a
|
||||||
* multiple of 2 (since ring updates must always be a multiple of 2)
|
* multiple of 2 (since ring updates must always be a multiple of 2)
|
||||||
* even though the actual update only requires 3 dwords.
|
* even though the actual update only requires 3 dwords.
|
||||||
*/
|
*/
|
||||||
#define MBOX_UPDATE_DWORDS 4
|
#define MBOX_UPDATE_DWORDS 4
|
||||||
intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1));
|
for_each_ring(useless, dev_priv, i) {
|
||||||
intel_ring_emit(ring, mmio_offset);
|
u32 mbox_reg = signaller->semaphore.mbox.signal[i];
|
||||||
intel_ring_emit(ring, ring->outstanding_lazy_seqno);
|
if (mbox_reg != GEN6_NOSYNC) {
|
||||||
intel_ring_emit(ring, MI_NOOP);
|
intel_ring_emit(signaller, MI_LOAD_REGISTER_IMM(1));
|
||||||
|
intel_ring_emit(signaller, mbox_reg);
|
||||||
|
intel_ring_emit(signaller, signaller->outstanding_lazy_seqno);
|
||||||
|
intel_ring_emit(signaller, MI_NOOP);
|
||||||
|
} else {
|
||||||
|
intel_ring_emit(signaller, MI_NOOP);
|
||||||
|
intel_ring_emit(signaller, MI_NOOP);
|
||||||
|
intel_ring_emit(signaller, MI_NOOP);
|
||||||
|
intel_ring_emit(signaller, MI_NOOP);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -692,9 +704,7 @@ static int
|
||||||
gen6_add_request(struct intel_ring_buffer *ring)
|
gen6_add_request(struct intel_ring_buffer *ring)
|
||||||
{
|
{
|
||||||
struct drm_device *dev = ring->dev;
|
struct drm_device *dev = ring->dev;
|
||||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
int ret, num_dwords = 4;
|
||||||
struct intel_ring_buffer *useless;
|
|
||||||
int i, ret, num_dwords = 4;
|
|
||||||
|
|
||||||
if (i915_semaphore_is_enabled(dev))
|
if (i915_semaphore_is_enabled(dev))
|
||||||
num_dwords += ((I915_NUM_RINGS-1) * MBOX_UPDATE_DWORDS);
|
num_dwords += ((I915_NUM_RINGS-1) * MBOX_UPDATE_DWORDS);
|
||||||
|
@ -704,13 +714,7 @@ gen6_add_request(struct intel_ring_buffer *ring)
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (i915_semaphore_is_enabled(dev)) {
|
ring->semaphore.signal(ring);
|
||||||
for_each_ring(useless, dev_priv, i) {
|
|
||||||
u32 mbox_reg = ring->semaphore.mbox.signal[i];
|
|
||||||
if (mbox_reg != GEN6_NOSYNC)
|
|
||||||
update_mboxes(ring, mbox_reg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
|
intel_ring_emit(ring, MI_STORE_DWORD_INDEX);
|
||||||
intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
|
intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
|
||||||
|
@ -1920,6 +1924,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
|
||||||
ring->get_seqno = gen6_ring_get_seqno;
|
ring->get_seqno = gen6_ring_get_seqno;
|
||||||
ring->set_seqno = ring_set_seqno;
|
ring->set_seqno = ring_set_seqno;
|
||||||
ring->semaphore.sync_to = gen6_ring_sync;
|
ring->semaphore.sync_to = gen6_ring_sync;
|
||||||
|
ring->semaphore.signal = gen6_signal;
|
||||||
/*
|
/*
|
||||||
* The current semaphore is only applied on pre-gen8 platform.
|
* The current semaphore is only applied on pre-gen8 platform.
|
||||||
* And there is no VCS2 ring on the pre-gen8 platform. So the
|
* And there is no VCS2 ring on the pre-gen8 platform. So the
|
||||||
|
@ -2104,6 +2109,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
|
||||||
gen6_ring_dispatch_execbuffer;
|
gen6_ring_dispatch_execbuffer;
|
||||||
}
|
}
|
||||||
ring->semaphore.sync_to = gen6_ring_sync;
|
ring->semaphore.sync_to = gen6_ring_sync;
|
||||||
|
ring->semaphore.signal = gen6_signal;
|
||||||
/*
|
/*
|
||||||
* The current semaphore is only applied on pre-gen8 platform.
|
* The current semaphore is only applied on pre-gen8 platform.
|
||||||
* And there is no VCS2 ring on the pre-gen8 platform. So the
|
* And there is no VCS2 ring on the pre-gen8 platform. So the
|
||||||
|
@ -2221,6 +2227,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
|
||||||
ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
|
ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
|
||||||
}
|
}
|
||||||
ring->semaphore.sync_to = gen6_ring_sync;
|
ring->semaphore.sync_to = gen6_ring_sync;
|
||||||
|
ring->semaphore.signal = gen6_signal;
|
||||||
/*
|
/*
|
||||||
* The current semaphore is only applied on pre-gen8 platform. And
|
* The current semaphore is only applied on pre-gen8 platform. And
|
||||||
* there is no VCS2 ring on the pre-gen8 platform. So the semaphore
|
* there is no VCS2 ring on the pre-gen8 platform. So the semaphore
|
||||||
|
@ -2270,6 +2277,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)
|
||||||
ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
|
ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
|
||||||
}
|
}
|
||||||
ring->semaphore.sync_to = gen6_ring_sync;
|
ring->semaphore.sync_to = gen6_ring_sync;
|
||||||
|
ring->semaphore.signal = gen6_signal;
|
||||||
ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_VER;
|
ring->semaphore.mbox.wait[RCS] = MI_SEMAPHORE_SYNC_VER;
|
||||||
ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_VEV;
|
ring->semaphore.mbox.wait[VCS] = MI_SEMAPHORE_SYNC_VEV;
|
||||||
ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_VEB;
|
ring->semaphore.mbox.wait[BCS] = MI_SEMAPHORE_SYNC_VEB;
|
||||||
|
|
|
@ -120,16 +120,19 @@ struct intel_ring_buffer {
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
u32 sync_seqno[I915_NUM_RINGS-1];
|
u32 sync_seqno[I915_NUM_RINGS-1];
|
||||||
/* AKA wait() */
|
|
||||||
int (*sync_to)(struct intel_ring_buffer *ring,
|
|
||||||
struct intel_ring_buffer *to,
|
|
||||||
u32 seqno);
|
|
||||||
struct {
|
struct {
|
||||||
/* our mbox written by others */
|
/* our mbox written by others */
|
||||||
u32 wait[I915_NUM_RINGS];
|
u32 wait[I915_NUM_RINGS];
|
||||||
/* mboxes this ring signals to */
|
/* mboxes this ring signals to */
|
||||||
u32 signal[I915_NUM_RINGS];
|
u32 signal[I915_NUM_RINGS];
|
||||||
} mbox;
|
} mbox;
|
||||||
|
|
||||||
|
/* AKA wait() */
|
||||||
|
int (*sync_to)(struct intel_ring_buffer *ring,
|
||||||
|
struct intel_ring_buffer *to,
|
||||||
|
u32 seqno);
|
||||||
|
void (*signal)(struct intel_ring_buffer *signaller);
|
||||||
} semaphore;
|
} semaphore;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue