diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-03-12 22:57:17 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-03-12 22:58:19 +0100 |
commit | 7735f8c6e525da0ea830f5a54a329abe2d6a1006 (patch) | |
tree | 103214df8974105513c71bb9b834c8d9a9d00331 /src/gallium/drivers/i915/i915_flush.c | |
parent | f6087955888ee089f986c19b576ef574c9e7bd06 (diff) |
i915g: fix transfer coherency
The kernel drm takes care of all coherency as long as we don't forget
to submit all outstanding commands in the batchbuffer ...
Also move batchbuffer initialization up because otherwise transfers
for some helper textures fail with a segmentation fault.
And kill the dead code, flushes should now be correct everywhere.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'src/gallium/drivers/i915/i915_flush.c')
-rw-r--r-- | src/gallium/drivers/i915/i915_flush.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/gallium/drivers/i915/i915_flush.c b/src/gallium/drivers/i915/i915_flush.c index 87966d9807..a5407cfd18 100644 --- a/src/gallium/drivers/i915/i915_flush.c +++ b/src/gallium/drivers/i915/i915_flush.c @@ -45,28 +45,6 @@ static void i915_flush_pipe( struct pipe_context *pipe, draw_flush(i915->draw); -#if 0 - /* Do we need to emit an MI_FLUSH command to flush the hardware - * caches? - */ - /* XXX These flags are now implicit. All of them. */ - if (flags & (PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_TEXTURE_CACHE)) { - unsigned flush = MI_FLUSH; - - if (!(flags & PIPE_FLUSH_RENDER_CACHE)) - flush |= INHIBIT_FLUSH_RENDER_CACHE; - - if (flags & PIPE_FLUSH_TEXTURE_CACHE) - flush |= FLUSH_MAP_CACHE; - - if (!BEGIN_BATCH(1)) { - FLUSH_BATCH(NULL); - assert(BEGIN_BATCH(1)); - } - OUT_BATCH( flush ); - } -#endif - if (i915->batch->map == i915->batch->ptr) { return; } |