tests: More bdw fallout

This commit is contained in:
Daniel Vetter 2013-11-14 23:15:37 +01:00
parent f7abef6618
commit df5e880bea
4 changed files with 4 additions and 5 deletions

View File

@ -102,13 +102,13 @@ intel_batchbuffer_require_space(struct intel_batchbuffer *batch,
OUT_BATCH(XY_SRC_COPY_BLT_CMD | \ OUT_BATCH(XY_SRC_COPY_BLT_CMD | \
XY_SRC_COPY_BLT_WRITE_ALPHA | \ XY_SRC_COPY_BLT_WRITE_ALPHA | \
XY_SRC_COPY_BLT_WRITE_RGB | \ XY_SRC_COPY_BLT_WRITE_RGB | \
flags | 8); \ (flags) | 8); \
} else { \ } else { \
BEGIN_BATCH(8); \ BEGIN_BATCH(8); \
OUT_BATCH(XY_SRC_COPY_BLT_CMD | \ OUT_BATCH(XY_SRC_COPY_BLT_CMD | \
XY_SRC_COPY_BLT_WRITE_ALPHA | \ XY_SRC_COPY_BLT_WRITE_ALPHA | \
XY_SRC_COPY_BLT_WRITE_RGB | \ XY_SRC_COPY_BLT_WRITE_RGB | \
flags | 6); \ (flags) | 6); \
} \ } \
} while(0) } while(0)

View File

@ -155,7 +155,6 @@ uint32_t batch_size = sizeof(gen6_batch);
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
const uint32_t hang[] = {-1, -1, -1, -1}; const uint32_t hang[] = {-1, -1, -1, -1};
const uint32_t end[] = {MI_BATCH_BUFFER_END, 0}; const uint32_t end[] = {MI_BATCH_BUFFER_END, 0};
uint64_t aper_size; uint64_t aper_size;

View File

@ -98,7 +98,7 @@ copy(int fd, uint32_t dst, uint32_t src)
batch[0] = XY_SRC_COPY_BLT_CMD | batch[0] = XY_SRC_COPY_BLT_CMD |
XY_SRC_COPY_BLT_WRITE_ALPHA | 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 */ batch[1] = (3 << 24) | /* 32 bits */
(0xcc << 16) | /* copy ROP */ (0xcc << 16) | /* copy ROP */
WIDTH*4; WIDTH*4;

View File

@ -334,7 +334,7 @@ static void blt_copy(int fd, uint32_t dst, uint32_t src)
*b++ = (XY_SRC_COPY_BLT_CMD | *b++ = (XY_SRC_COPY_BLT_CMD |
XY_SRC_COPY_BLT_WRITE_ALPHA | 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++ = 3 << 24 | 0xcc << 16 | WIDTH * 4;
*b++ = 0; *b++ = 0;
*b++ = HEIGHT << 16 | WIDTH; *b++ = HEIGHT << 16 | WIDTH;