From 8503578e8211f91d063cd99f0b810db3957e5605 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 30 Jan 2018 01:09:53 -0800 Subject: [PATCH] iris: fix silly unused batch with addr macro --- src/gallium/drivers/iris/iris_state.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index d6a7a88a37a..5193f14a9c2 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -114,9 +114,10 @@ get_command_space(struct iris_batch *batch, unsigned bytes) dw[i] = (dwords)[i]; \ } \ uint64_t *qw = (uint64_t *) &dw[addr_idx]; \ - qw = iris_batch_reloc(batch, qw - batch->cmdbuf.map, addr.bo, \ - addr.offset + (dwords)[addr_idx + 1], \ - addr.reloc_flags); \ + *qw = iris_batch_reloc(batch, (void *)qw - batch->cmdbuf.map, \ + addr.bo, \ + addr.offset + (dwords)[addr_idx + 1], \ + addr.reloc_flags); \ for (uint32_t i = addr_idx + 1; i < num_dw; i++) { \ dw[i] = (dwords)[i]; \ } \ -- 2.30.2