summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/gem_stress.c1
-rw-r--r--tests/gem_stress_i830.c4
-rw-r--r--tests/gem_stress_i915.c4
3 files changed, 4 insertions, 5 deletions
diff --git a/tests/gem_stress.c b/tests/gem_stress.c
index ca1a95cf..6c57bb25 100644
--- a/tests/gem_stress.c
+++ b/tests/gem_stress.c
@@ -292,7 +292,6 @@ static void next_copyfunc(int tile)
} else if (copyfunc_seq % 17 == 0) {
if (tile == options.trace_tile)
printf(" using cpu\n");
- fence_storm = num_fences;
copyfunc = cpu_copyfunc;
} else if (copyfunc_seq % 19 == 0) {
if (tile == options.trace_tile)
diff --git a/tests/gem_stress_i830.c b/tests/gem_stress_i830.c
index a76e8332..4d4f5efd 100644
--- a/tests/gem_stress_i830.c
+++ b/tests/gem_stress_i830.c
@@ -59,7 +59,7 @@ void gen2_render_copyfunc(struct scratch_buf *src, unsigned src_x, unsigned src_
static unsigned keep_gpu_busy_counter = 0;
/* check both edges of the fence usage */
- if (keep_gpu_busy_counter & 1 && !fence_storm)
+ if (keep_gpu_busy_counter & 1)
keep_gpu_busy();
/* 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_y, buf_height(src));
- if (!(keep_gpu_busy_counter & 1) && !fence_storm)
+ if (!(keep_gpu_busy_counter & 1))
keep_gpu_busy();
keep_gpu_busy_counter++;
diff --git a/tests/gem_stress_i915.c b/tests/gem_stress_i915.c
index 66787c7f..72e04f03 100644
--- a/tests/gem_stress_i915.c
+++ b/tests/gem_stress_i915.c
@@ -9,7 +9,7 @@ void gen3_render_copyfunc(struct scratch_buf *src, unsigned src_x, unsigned src_
static unsigned keep_gpu_busy_counter = 0;
/* check both edges of the fence usage */
- if (keep_gpu_busy_counter & 1 && !fence_storm)
+ if (keep_gpu_busy_counter & 1)
keep_gpu_busy();
/* 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_y, buf_height(src));
- if (!(keep_gpu_busy_counter & 1) && !fence_storm)
+ if (!(keep_gpu_busy_counter & 1))
keep_gpu_busy();
keep_gpu_busy_counter++;