diff options
| author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-11-07 22:59:25 -0800 |
|---|---|---|
| committer | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-11-07 23:06:01 -0800 |
| commit | 7c41331364ea2ea7a5c7c76c0b66bbc590eade60 (patch) | |
| tree | 793eaeedb866074f17ebfcfd7ad4093ec7ab6f8c /tests/gem_evict_everything.c | |
| parent | 1d9512f6ce136edc23b78cb1352ec2a54152a42b (diff) | |
gem_evict_everything: Fix broken blit generalization
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Diffstat (limited to 'tests/gem_evict_everything.c')
| -rw-r--r-- | tests/gem_evict_everything.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/gem_evict_everything.c b/tests/gem_evict_everything.c index 7e05ff80..762aef1e 100644 --- a/tests/gem_evict_everything.c +++ b/tests/gem_evict_everything.c @@ -67,12 +67,12 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int error) batch[i++] = 0; /* dst x1,y1 */ batch[i++] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ batch[i++] = 0; /* dst reloc */ - if (intel_get_drm_devid(fd) >= 8) + if (intel_gen(intel_get_drm_devid(fd)) >= 8) batch[i++] = 0; /* FIXME */ batch[i++] = 0; /* src x1,y1 */ batch[i++] = WIDTH*4; batch[i++] = 0; /* src reloc */ - if (intel_get_drm_devid(fd) >= 8) + if (intel_gen(intel_get_drm_devid(fd)) >= 8) batch[i++] = 0; /* FIXME */ batch[i++] = MI_BATCH_BUFFER_END; batch[i++] = MI_NOOP; @@ -90,6 +90,8 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int error) reloc[1].target_handle = src; reloc[1].delta = 0; reloc[1].offset = 7 * sizeof(batch[0]); + if (intel_gen(intel_get_drm_devid(fd)) >= 8) + reloc[1].offset += sizeof(batch[0]); reloc[1].presumed_offset = 0; reloc[1].read_domains = I915_GEM_DOMAIN_RENDER; reloc[1].write_domain = 0; |