gem_stress: clean up fence_storm

That little snippet creapt in and magically made render copy work -
by essentially disabling it.

Restore order, everything incoherent again.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2011-04-04 21:24:58 +02:00
parent aeb0b6f33c
commit 272c898807
3 changed files with 4 additions and 5 deletions

View File

@ -292,7 +292,6 @@ static void next_copyfunc(int tile)
} else if (copyfunc_seq % 17 == 0) { } else if (copyfunc_seq % 17 == 0) {
if (tile == options.trace_tile) if (tile == options.trace_tile)
printf(" using cpu\n"); printf(" using cpu\n");
fence_storm = num_fences;
copyfunc = cpu_copyfunc; copyfunc = cpu_copyfunc;
} else if (copyfunc_seq % 19 == 0) { } else if (copyfunc_seq % 19 == 0) {
if (tile == options.trace_tile) if (tile == options.trace_tile)

View File

@ -59,7 +59,7 @@ void gen2_render_copyfunc(struct scratch_buf *src, unsigned src_x, unsigned src_
static unsigned keep_gpu_busy_counter = 0; static unsigned keep_gpu_busy_counter = 0;
/* check both edges of the fence usage */ /* check both edges of the fence usage */
if (keep_gpu_busy_counter & 1 && !fence_storm) if (keep_gpu_busy_counter & 1)
keep_gpu_busy(); keep_gpu_busy();
/* invariant state */ /* invariant state */
@ -345,7 +345,7 @@ void gen2_render_copyfunc(struct scratch_buf *src, unsigned src_x, unsigned src_
emit_vertex_normalized(src_x, buf_width(src)); emit_vertex_normalized(src_x, buf_width(src));
emit_vertex_normalized(src_y, buf_height(src)); emit_vertex_normalized(src_y, buf_height(src));
if (!(keep_gpu_busy_counter & 1) && !fence_storm) if (!(keep_gpu_busy_counter & 1))
keep_gpu_busy(); keep_gpu_busy();
keep_gpu_busy_counter++; keep_gpu_busy_counter++;

View File

@ -9,7 +9,7 @@ void gen3_render_copyfunc(struct scratch_buf *src, unsigned src_x, unsigned src_
static unsigned keep_gpu_busy_counter = 0; static unsigned keep_gpu_busy_counter = 0;
/* check both edges of the fence usage */ /* check both edges of the fence usage */
if (keep_gpu_busy_counter & 1 && !fence_storm) if (keep_gpu_busy_counter & 1)
keep_gpu_busy(); keep_gpu_busy();
/* invariant state */ /* invariant state */
@ -187,7 +187,7 @@ void gen3_render_copyfunc(struct scratch_buf *src, unsigned src_x, unsigned src_
emit_vertex_normalized(src_x, buf_width(src)); emit_vertex_normalized(src_x, buf_width(src));
emit_vertex_normalized(src_y, buf_height(src)); emit_vertex_normalized(src_y, buf_height(src));
if (!(keep_gpu_busy_counter & 1) && !fence_storm) if (!(keep_gpu_busy_counter & 1))
keep_gpu_busy(); keep_gpu_busy();
keep_gpu_busy_counter++; keep_gpu_busy_counter++;