diff options
| author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-10-09 08:37:48 -0700 |
|---|---|---|
| committer | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-10-09 12:52:09 -0700 |
| commit | 637162d0f7dee79c08c49d717c295be0b0d4696e (patch) | |
| tree | 8569ded1a6b875979d3bb08d667621efb32f6fbf /tests | |
| parent | aa6fbd18d4f52b2bc9e6bf9c16b9bcd585a1ae6b (diff) | |
gem_evict_*: Use iterator for blit batch
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gem_evict_alignment.c | 22 | ||||
| -rw-r--r-- | tests/gem_evict_everything.c | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/tests/gem_evict_alignment.c b/tests/gem_evict_alignment.c index af0cbbf4..57eb5860 100644 --- a/tests/gem_evict_alignment.c +++ b/tests/gem_evict_alignment.c @@ -56,22 +56,22 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int alignme struct drm_i915_gem_exec_object2 *obj; struct drm_i915_gem_execbuffer2 exec; uint32_t handle; - int n, ret; + int n, ret, i=0; - batch[0] = (XY_SRC_COPY_BLT_CMD | + batch[i++] = (XY_SRC_COPY_BLT_CMD | XY_SRC_COPY_BLT_WRITE_ALPHA | XY_SRC_COPY_BLT_WRITE_RGB); - batch[1] = (3 << 24) | /* 32 bits */ + batch[i++] = (3 << 24) | /* 32 bits */ (0xcc << 16) | /* copy ROP */ WIDTH*4; - batch[2] = 0; /* dst x1,y1 */ - batch[3] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ - batch[4] = 0; /* dst reloc */ - batch[5] = 0; /* src x1,y1 */ - batch[6] = WIDTH*4; - batch[7] = 0; /* src reloc */ - batch[8] = MI_BATCH_BUFFER_END; - batch[9] = MI_NOOP; + batch[i++] = 0; /* dst x1,y1 */ + batch[i++] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ + batch[i++] = 0; /* dst reloc */ + batch[i++] = 0; /* src x1,y1 */ + batch[i++] = WIDTH*4; + batch[i++] = 0; /* src reloc */ + batch[i++] = MI_BATCH_BUFFER_END; + batch[i++] = MI_NOOP; handle = gem_create(fd, 4096); gem_write(fd, handle, 0, batch, sizeof(batch)); diff --git a/tests/gem_evict_everything.c b/tests/gem_evict_everything.c index 4eb7cb40..ae856b05 100644 --- a/tests/gem_evict_everything.c +++ b/tests/gem_evict_everything.c @@ -56,22 +56,22 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int error) struct drm_i915_gem_exec_object2 *obj; struct drm_i915_gem_execbuffer2 exec; uint32_t handle; - int n, ret; + int n, ret, i=0; - batch[0] = (XY_SRC_COPY_BLT_CMD | + batch[i++] = (XY_SRC_COPY_BLT_CMD | XY_SRC_COPY_BLT_WRITE_ALPHA | XY_SRC_COPY_BLT_WRITE_RGB); - batch[1] = (3 << 24) | /* 32 bits */ + batch[i++] = (3 << 24) | /* 32 bits */ (0xcc << 16) | /* copy ROP */ WIDTH*4; - batch[2] = 0; /* dst x1,y1 */ - batch[3] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ - batch[4] = 0; /* dst reloc */ - batch[5] = 0; /* src x1,y1 */ - batch[6] = WIDTH*4; - batch[7] = 0; /* src reloc */ - batch[8] = MI_BATCH_BUFFER_END; - batch[9] = MI_NOOP; + batch[i++] = 0; /* dst x1,y1 */ + batch[i++] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ + batch[i++] = 0; /* dst reloc */ + batch[i++] = 0; /* src x1,y1 */ + batch[i++] = WIDTH*4; + batch[i++] = 0; /* src reloc */ + batch[i++] = MI_BATCH_BUFFER_END; + batch[i++] = MI_NOOP; handle = gem_create(fd, 4096); gem_write(fd, handle, 0, batch, sizeof(batch)); |