tests: fixup storedw tests

We need to use _INSTRUCTION as the reloc domain because otherwise the
ppgtt pipe_control w/a for snb won't kick in and the test fails.

The storedw tests for blt and bsd are still disabled because the
corresponding patch to flag ppgtt support isn't merged upstream yet.
Without ppgtt these hang my snb here.

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/tests/gem_storedw_loop_blt.c b/tests/gem_storedw_loop_blt.c
index c67c2b3..88b12d3 100644 (file)
--- a/tests/gem_storedw_loop_blt.c
+++ b/tests/gem_storedw_loop_blt.c
@@ -62,8 +62,8 @@ store_dword_loop(void)
                BEGIN_BATCH(4);
                OUT_BATCH(cmd);
                OUT_BATCH(0); /* reserved */
-               OUT_RELOC(target_buffer, I915_GEM_DOMAIN_RENDER,
-                         I915_GEM_DOMAIN_RENDER, 0);
+               OUT_RELOC(target_buffer, I915_GEM_DOMAIN_INSTRUCTION,
+                         I915_GEM_DOMAIN_INSTRUCTION, 0);
                OUT_BATCH(val);
                ADVANCE_BATCH();
 

diff --git a/tests/gem_storedw_loop_bsd.c b/tests/gem_storedw_loop_bsd.c
index 91e4e59..09351e2 100644 (file)
--- a/tests/gem_storedw_loop_bsd.c
+++ b/tests/gem_storedw_loop_bsd.c
@@ -62,8 +62,8 @@ store_dword_loop(void)
                BEGIN_BATCH(4);
                OUT_BATCH(cmd);
                OUT_BATCH(0); /* reserved */
-               OUT_RELOC(target_buffer, I915_GEM_DOMAIN_RENDER,
-                         I915_GEM_DOMAIN_RENDER, 0);
+               OUT_RELOC(target_buffer, I915_GEM_DOMAIN_INSTRUCTION,
+                         I915_GEM_DOMAIN_INSTRUCTION, 0);
                OUT_BATCH(val);
                ADVANCE_BATCH();
 

diff --git a/tests/gem_storedw_loop_render.c b/tests/gem_storedw_loop_render.c
index b3d7df2..b3b7417 100644 (file)
--- a/tests/gem_storedw_loop_render.c
+++ b/tests/gem_storedw_loop_render.c
@@ -62,8 +62,8 @@ store_dword_loop(void)
                BEGIN_BATCH(4);
                OUT_BATCH(cmd);
                OUT_BATCH(0); /* reserved */
-               OUT_RELOC(target_buffer, I915_GEM_DOMAIN_RENDER,
-                         I915_GEM_DOMAIN_RENDER, 0);
+               OUT_RELOC(target_buffer, I915_GEM_DOMAIN_INSTRUCTION,
+                         I915_GEM_DOMAIN_INSTRUCTION, 0);
                OUT_BATCH(val);
                ADVANCE_BATCH();