On Thu, Aug 02, 2018 at 10:39:13AM +0100, Lionel Landwerlin wrote: > Up to now we've been lucky that the buffer returned was always exactly > at the address we requested.
Looks like this needs to land, even if the rest of the series doesn't. Reviewed-by: Rafael Antognolli <rafael.antogno...@intel.com> > Fixes: 144b40db5411 ("intel: aubinator: drop the 1Tb GTT mapping") > Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> > --- > src/intel/tools/aubinator.c | 4 ++-- > 1 file 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; > -- > 2.18.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev