diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-02-25 23:40:27 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-02-27 22:10:46 +0100 |
commit | d42c9433b0a3d9b3a198261d8037ce0d4595452d (patch) | |
tree | 663b65b395504391a908e828c562bbc41ca14e5b /src/gallium/drivers/i915/i915_state_emit.c | |
parent | f90fa55347c641cd0bcdde121909045f0dedbd66 (diff) | |
download | external_mesa3d-d42c9433b0a3d9b3a198261d8037ce0d4595452d.zip external_mesa3d-d42c9433b0a3d9b3a198261d8037ce0d4595452d.tar.gz external_mesa3d-d42c9433b0a3d9b3a198261d8037ce0d4595452d.tar.bz2 |
i915g: implement cache flushing
With an extremely dumb strategy. But it's the same i915c employs.
Also improve the hw_atom code slightly by statically specifying the
required batch space. For extremely variably stuff (shaders, constants)
it would probably be better to add a new parameter to the hw_atom->validate
function.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'src/gallium/drivers/i915/i915_state_emit.c')
-rw-r--r-- | src/gallium/drivers/i915/i915_state_emit.c | 47 |
1 files changed, 39 insertions, 8 deletions
diff --git a/src/gallium/drivers/i915/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c index 610d20a..0323ad9 100644 --- a/src/gallium/drivers/i915/i915_state_emit.c +++ b/src/gallium/drivers/i915/i915_state_emit.c @@ -42,11 +42,26 @@ struct i915_tracked_hw_state { const char *name; void (*validate)(struct i915_context *); void (*emit)(struct i915_context *); - unsigned dirty; + unsigned dirty, batch_space; }; static void +emit_flush(struct i915_context *i915) +{ + /* Cache handling is very cheap atm. State handling can request to flushes: + * - I915_FLUSH_CACHE which is a flush everything request and + * - I915_PIPELINE_FLUSH which is specifically for the draw_offset flush. + * Because the cache handling is so dumb, no explicit "invalidate map cache". + * Also, the first is a strict superset of the latter, so the following logic + * works. */ + if (i915->flush_dirty & I915_FLUSH_CACHE) + OUT_BATCH(MI_FLUSH | FLUSH_MAP_CACHE); + else if (i915->flush_dirty & I915_PIPELINE_FLUSH) + OUT_BATCH(MI_FLUSH | INHIBIT_FLUSH_RENDER_CACHE); +} + +static void validate_immediate(struct i915_context *i915) { if (i915->immediate_dirty & (1 << I915_IMMEDIATE_S0)) @@ -82,21 +97,25 @@ validate_map(struct i915_context *i915) } const static struct i915_tracked_hw_state hw_atoms[] = { + { "flush", NULL, emit_flush, I915_HW_FLUSH, 1 }, { "immediate", validate_immediate, NULL, I915_HW_IMMEDIATE }, { "static", validate_static, NULL, I915_HW_STATIC }, { "map", validate_map, NULL, I915_HW_MAP } }; static boolean -i915_validate_state(struct i915_context *i915) +i915_validate_state(struct i915_context *i915, unsigned *batch_space) { int i; i915->num_validation_buffers = 0; + *batch_space = 0; for (i = 0; i < Elements(hw_atoms); i++) - if ((i915->hardware_dirty & hw_atoms[i].dirty) && hw_atoms[i].validate) + if ((i915->hardware_dirty & hw_atoms[i].dirty) && hw_atoms[i].validate) { hw_atoms[i].validate(i915); + *batch_space += hw_atoms[i].batch_space; + } if (i915->num_validation_buffers == 0) return TRUE; @@ -108,11 +127,22 @@ i915_validate_state(struct i915_context *i915) return TRUE; } +static void +emit_state(struct i915_context *i915) +{ + int i; + + for (i = 0; i < Elements(hw_atoms); i++) + if ((i915->hardware_dirty & hw_atoms[i].dirty) && hw_atoms[i].emit) + hw_atoms[i].emit(i915); +} + /* Push the state into the sarea and/or texture memory. */ void i915_emit_hardware_state(struct i915_context *i915 ) { + unsigned batch_space; /* XXX: there must be an easier way */ const unsigned dwords = ( 14 + 7 + @@ -138,20 +168,21 @@ i915_emit_hardware_state(struct i915_context *i915 ) if (I915_DBG_ON(DBG_ATOMS)) i915_dump_hardware_dirty(i915, __FUNCTION__); - if (!i915_validate_state(i915)) { + if (!i915_validate_state(i915, &batch_space)) { FLUSH_BATCH(NULL); - assert(i915_validate_state(i915)); + assert(i915_validate_state(i915, &batch_space)); } - if(!BEGIN_BATCH(dwords, relocs)) { + if(!BEGIN_BATCH(batch_space + dwords, relocs)) { FLUSH_BATCH(NULL); - assert(i915_validate_state(i915)); - assert(BEGIN_BATCH(dwords, relocs)); + assert(i915_validate_state(i915, &batch_space)); + assert(BEGIN_BATCH(batch_space + dwords, relocs)); } save_ptr = (uintptr_t)i915->batch->ptr; save_relocs = i915->batch->relocs; + emit_state(i915); /* 14 dwords, 0 relocs */ if (i915->hardware_dirty & I915_HW_INVARIANT) { |