tests: More bdw fallout

diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h
index 11b7e6e..6e24e98 100644 (file)
--- a/lib/intel_batchbuffer.h
+++ b/lib/intel_batchbuffer.h
@@ -102,13 +102,13 @@ intel_batchbuffer_require_space(struct intel_batchbuffer *batch,
                OUT_BATCH(XY_SRC_COPY_BLT_CMD | \
                                XY_SRC_COPY_BLT_WRITE_ALPHA | \
                                XY_SRC_COPY_BLT_WRITE_RGB | \
-                               flags | 8); \
+                               (flags) | 8); \
        } else { \
                BEGIN_BATCH(8); \
                OUT_BATCH(XY_SRC_COPY_BLT_CMD | \
                                XY_SRC_COPY_BLT_WRITE_ALPHA | \
                                XY_SRC_COPY_BLT_WRITE_RGB | \
-                               flags | 6); \
+                               (flags) | 6); \
        } \
 } while(0)
 

diff --git a/tests/gem_cpu_reloc.c b/tests/gem_cpu_reloc.c
index 773b15a..c11dcbb 100644 (file)
--- a/tests/gem_cpu_reloc.c
+++ b/tests/gem_cpu_reloc.c
@@ -155,7 +155,6 @@ uint32_t batch_size = sizeof(gen6_batch);
 
 int main(int argc, char **argv)
 {
-
        const uint32_t hang[] = {-1, -1, -1, -1};
        const uint32_t end[] = {MI_BATCH_BUFFER_END, 0};
        uint64_t aper_size;

diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c
index 8dd8c61..3c77281 100644 (file)
--- a/tests/gem_vmap_blits.c
+++ b/tests/gem_vmap_blits.c
@@ -98,7 +98,7 @@ copy(int fd, uint32_t dst, uint32_t src)
 
        batch[0] = XY_SRC_COPY_BLT_CMD |
                  XY_SRC_COPY_BLT_WRITE_ALPHA |
-                 XY_SRC_COPY_BLT_WRITE_RGB;
+                 XY_SRC_COPY_BLT_WRITE_RGB | 6;
        batch[1] = (3 << 24) | /* 32 bits */
                  (0xcc << 16) | /* copy ROP */
                  WIDTH*4;

diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c
index 1f91df6..0b7109d 100644 (file)
--- a/tests/gen3_mixed_blits.c
+++ b/tests/gen3_mixed_blits.c
@@ -334,7 +334,7 @@ static void blt_copy(int fd, uint32_t dst, uint32_t src)
 
        *b++ = (XY_SRC_COPY_BLT_CMD |
                XY_SRC_COPY_BLT_WRITE_ALPHA |
-               XY_SRC_COPY_BLT_WRITE_RGB);
+               XY_SRC_COPY_BLT_WRITE_RGB | 6);
        *b++ = 3 << 24 | 0xcc << 16 | WIDTH * 4;
        *b++ = 0;
        *b++ = HEIGHT << 16 | WIDTH;