diff options
| author | Toni Lönnberg <[email protected]> | 2018-11-08 14:41:01 +0200 |
|---|---|---|
| committer | Lionel Landwerlin <[email protected]> | 2018-11-13 15:10:12 +0000 |
| commit | a6aab7e4364709778652f11586607dfac7284c4e (patch) | |
| tree | 206459c5f3455166c44f2b5b33d188a1c6c1bbc0 /src/intel/tools/aub_read.c | |
| parent | b00bccd01201b4673ffd1414eb80bdc63d46105f (diff) | |
intel/decoder: tools: gen_engine to drm_i915_gem_engine_class
Removed the gen_engine enum and changed the involved functions to use the
drm_i915_gem_engine_class enum from UAPI instead.
v3: Wrong engine was being used for blocks in video ring
v4: Fixed aubinator_viewer.cpp
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/intel/tools/aub_read.c')
| -rw-r--r-- | src/intel/tools/aub_read.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/intel/tools/aub_read.c b/src/intel/tools/aub_read.c index cde6cb4ba03..20cb515376f 100644 --- a/src/intel/tools/aub_read.c +++ b/src/intel/tools/aub_read.c @@ -136,7 +136,7 @@ handle_trace_block(struct aub_read *read, const uint32_t *p) int type = p[1] & AUB_TRACE_TYPE_MASK; int address_space = p[1] & AUB_TRACE_ADDRESS_SPACE_MASK; int header_length = p[0] & 0xffff; - int engine = GEN_ENGINE_RENDER; + enum drm_i915_gem_engine_class engine = I915_ENGINE_CLASS_RENDER; const void *data = p + header_length + 2; uint64_t address = gen_48b_address((read->devinfo.gen >= 8 ? ((uint64_t) p[5] << 32) : 0) | ((uint64_t) p[3])); @@ -151,13 +151,13 @@ handle_trace_block(struct aub_read *read, const uint32_t *p) case AUB_TRACE_OP_COMMAND_WRITE: switch (type) { case AUB_TRACE_TYPE_RING_PRB0: - engine = GEN_ENGINE_RENDER; + engine = I915_ENGINE_CLASS_RENDER; break; case AUB_TRACE_TYPE_RING_PRB1: - engine = GEN_ENGINE_VIDEO; + engine = I915_ENGINE_CLASS_VIDEO; break; case AUB_TRACE_TYPE_RING_PRB2: - engine = GEN_ENGINE_BLITTER; + engine = I915_ENGINE_CLASS_COPY; break; default: parse_error(read, p, "command write to unknown ring %d\n", type); @@ -182,7 +182,7 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p) if (read->reg_write) read->reg_write(read->user_data, offset, value); - int engine; + enum drm_i915_gem_engine_class engine; uint64_t context_descriptor; switch (offset) { @@ -192,7 +192,7 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p) return; read->render_elsp_index = 0; - engine = GEN_ENGINE_RENDER; + engine = I915_ENGINE_CLASS_RENDER; context_descriptor = (uint64_t)read->render_elsp[2] << 32 | read->render_elsp[3]; break; @@ -202,7 +202,7 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p) return; read->video_elsp_index = 0; - engine = GEN_ENGINE_VIDEO; + engine = I915_ENGINE_CLASS_VIDEO; context_descriptor = (uint64_t)read->video_elsp[2] << 32 | read->video_elsp[3]; break; @@ -212,7 +212,7 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p) return; read->blitter_elsp_index = 0; - engine = GEN_ENGINE_BLITTER; + engine = I915_ENGINE_CLASS_COPY; context_descriptor = (uint64_t)read->blitter_elsp[2] << 32 | read->blitter_elsp[3]; break; @@ -235,17 +235,17 @@ handle_memtrace_reg_write(struct aub_read *read, const uint32_t *p) read->blitter_elsp[2] = value; return; case 0x2550: /* render elsc */ - engine = GEN_ENGINE_RENDER; + engine = I915_ENGINE_CLASS_RENDER; context_descriptor = (uint64_t)read->render_elsp[2] << 32 | read->render_elsp[3]; break; case 0x12550: /* video_elsc */ - engine = GEN_ENGINE_VIDEO; + engine = I915_ENGINE_CLASS_VIDEO; context_descriptor = (uint64_t)read->video_elsp[2] << 32 | read->video_elsp[3]; break; case 0x22550: /* blitter elsc */ - engine = GEN_ENGINE_BLITTER; + engine = I915_ENGINE_CLASS_COPY; context_descriptor = (uint64_t)read->blitter_elsp[2] << 32 | read->blitter_elsp[3]; break; |