diff options
| author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-12-05 14:44:23 -0800 |
|---|---|---|
| committer | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-12-05 15:32:22 -0800 |
| commit | b23d73788a7d494f99d74bafb762dd825deb6697 (patch) | |
| tree | f52b16acbdbc6c6468141a1d79f685287e989d8d | |
| parent | ba0d651a017d9c633e7530b7d13ec6abaeaedceb (diff) | |
gem_persistent_relocs: Update for gen8 BLT cmds
NOTE: Some subtests are still failing, but I haven't found the bug yet.
At least this should help QA meanwhile.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | tests/gem_persistent_relocs.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tests/gem_persistent_relocs.c b/tests/gem_persistent_relocs.c index 0b33b625..50d8e0e3 100644 --- a/tests/gem_persistent_relocs.c +++ b/tests/gem_persistent_relocs.c @@ -64,17 +64,6 @@ int special_reloc_ofs; int special_line_ofs; int special_batch_len; -#define GFX_OP_PIPE_CONTROL ((0x3<<29)|(0x3<<27)|(0x2<<24)|2) -#define PIPE_CONTROL_WRITE_IMMEDIATE (1<<14) -#define PIPE_CONTROL_WRITE_TIMESTAMP (3<<14) -#define PIPE_CONTROL_DEPTH_STALL (1<<13) -#define PIPE_CONTROL_WC_FLUSH (1<<12) -#define PIPE_CONTROL_IS_FLUSH (1<<11) /* MBZ on Ironlake */ -#define PIPE_CONTROL_TC_FLUSH (1<<10) /* GM45+ only */ -#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1) -#define PIPE_CONTROL_CS_STALL (1<<20) -#define PIPE_CONTROL_GLOBAL_GTT (1<<2) /* in addr dword */ - int small_pitch = 64; static drm_intel_bo *create_special_bo(void) @@ -87,13 +76,23 @@ static drm_intel_bo *create_special_bo(void) memset(data, 0, 4096); bo = drm_intel_bo_alloc(bufmgr, "special batch", 4096, 4096); - BATCH(XY_COLOR_BLT_CMD | COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB); + if (intel_gen(devid) >= 8) { + BATCH(MI_NOOP); + BATCH(XY_COLOR_BLT_CMD_NOLEN | 5 | + COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB); + } else { + BATCH(XY_COLOR_BLT_CMD_NOLEN | 4 | + COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB); + } + BATCH((3 << 24) | (0xf0 << 16) | small_pitch); special_line_ofs = 4*len; BATCH(0); BATCH(1 << 16 | 1); special_reloc_ofs = 4*len; BATCH(0); + if (intel_gen(devid) >= 8) + BATCH(0); /* FIXME */ BATCH(0xdeadbeef); #define CMD_POLY_STIPPLE_OFFSET 0x7906 @@ -138,7 +137,7 @@ static void emit_dummy_load(int pitch) BLIT_RELOC_UDW(devid); ADVANCE_BATCH(); - if (IS_GEN6(devid) || IS_GEN7(devid)) { + if (intel_gen(devid) >= 6) { BEGIN_BATCH(3); OUT_BATCH(XY_SETUP_CLIP_BLT_CMD); OUT_BATCH(0); |