diff options
author | Lionel Landwerlin <[email protected]> | 2018-07-31 07:12:56 +0100 |
---|---|---|
committer | Lionel Landwerlin <[email protected]> | 2018-08-04 09:38:34 +0100 |
commit | 35955afa7aa49906fad772b44d3e6357203430ae (patch) | |
tree | d77b0adac9d377f93d835e55da027771486ddd3b /src/intel | |
parent | 3b07d28f810457a3c6176504c9d6c65ed0697e34 (diff) |
intel: aubinator: fix read the context/ring
Up to now we've been lucky that the buffer returned was always exactly
at the address we requested.
Fixes: 144b40db5411 ("intel: aubinator: drop the 1Tb GTT mapping")
Signed-off-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Rafael Antognolli <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r-- | src/intel/tools/aubinator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c index 8989d558b66..3fec04c24c4 100644 --- a/src/intel/tools/aubinator.c +++ b/src/intel/tools/aubinator.c @@ -590,7 +590,7 @@ handle_memtrace_reg_write(uint32_t *p) uint32_t pphwsp_addr = context_descriptor & 0xfffff000; struct gen_batch_decode_bo pphwsp_bo = get_ggtt_batch_bo(NULL, pphwsp_addr); uint32_t *context = (uint32_t *)((uint8_t *)pphwsp_bo.map + - (pphwsp_bo.addr - pphwsp_addr) + + (pphwsp_addr - pphwsp_bo.addr) + pphwsp_size); uint32_t ring_buffer_head = context[5]; @@ -601,7 +601,7 @@ handle_memtrace_reg_write(uint32_t *p) struct gen_batch_decode_bo ring_bo = get_ggtt_batch_bo(NULL, ring_buffer_start); assert(ring_bo.size > 0); - void *commands = (uint8_t *)ring_bo.map + (ring_bo.addr - ring_buffer_start); + void *commands = (uint8_t *)ring_bo.map + (ring_buffer_start - ring_bo.addr); if (context_descriptor & 0x100 /* ppgtt */) { batch_ctx.get_bo = get_ppgtt_batch_bo; |