flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 02:16:17 +00:00
Code Issues Releases Wiki Activity

tests/gem_set_tiling_vs_blt: fix on gen4+

Browse Source 
Oops, the new checks need correctly tiled blts to work.

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2012-04-17 13:25:04 +02:00
parent b38188ad97
commit 48ec7f9edd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/gem_set_tiling_vs_blt.c
View File

@ -79,6 +79,7 @@ static void do_test(uint32_t tiling, unsigned stride,
int i, ret; int i, ret;
uint32_t *ptr; uint32_t *ptr;
uint32_t test_bo_handle; uint32_t test_bo_handle;
uint32_t blt_stride, blt_bits;
bool tiling_changed = false; bool tiling_changed = false;
printf("filling ring .. "); printf("filling ring .. ");
@ -151,9 +152,17 @@ static void do_test(uint32_t tiling, unsigned stride,
drm_intel_gem_bo_unmap_gtt(test_bo); drm_intel_gem_bo_unmap_gtt(test_bo);
} }
blt_stride = stride;
blt_bits = 0;
if (intel_gen(devid) >= 4 && tiling != I915_TILING_NONE) {
blt_stride /= 4;
blt_bits = XY_SRC_COPY_BLT_SRC_TILED;
}
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 |
blt_bits |
XY_SRC_COPY_BLT_WRITE_RGB); XY_SRC_COPY_BLT_WRITE_RGB);
OUT_BATCH((3 << 24) | /* 32 bits */ OUT_BATCH((3 << 24) | /* 32 bits */
(0xcc << 16) | /* copy ROP */ (0xcc << 16) | /* copy ROP */
@ -162,7 +171,7 @@ static void do_test(uint32_t tiling, unsigned stride,
OUT_BATCH((TEST_HEIGHT(stride)) << 16 | (TEST_WIDTH(stride))); OUT_BATCH((TEST_HEIGHT(stride)) << 16 | (TEST_WIDTH(stride)));
OUT_RELOC_FENCED(target_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0); OUT_RELOC_FENCED(target_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
OUT_BATCH(0 << 16 | 0); OUT_BATCH(0 << 16 | 0);
OUT_BATCH(stride); OUT_BATCH(blt_stride);
OUT_RELOC_FENCED(test_bo, I915_GEM_DOMAIN_RENDER, 0, 0); OUT_RELOC_FENCED(test_bo, I915_GEM_DOMAIN_RENDER, 0, 0);
ADVANCE_BATCH(); ADVANCE_BATCH();
intel_batchbuffer_flush(batch); intel_batchbuffer_flush(batch);