From b7bf755c92aebb57df5faf46f7b4026fd78cbc14 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Sat, 17 Apr 2021 18:21:26 +0300
Subject: [PATCH] intel/mi_builder: fix resolve call

Giving NULL for anv_combine_address() triggers an assert in that
function.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 8525ebe6e375 ("intel/mi_builder: Return an address from __gen_get_batch_address")
Reviewed-by: Felix DeGrood <felix.j.degrood@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10301>
(cherry picked from commit 2c2de4d60efc8bd315374b003d2b7e2c63737002)
---
 .pick_status.json             | 2 +-
 src/intel/common/mi_builder.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f77dabeed72..d40b5485217 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -355,7 +355,7 @@
         "description": "intel/mi_builder: fix resolve call",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "8525ebe6e37584f2914cdbf67eb70253e606351f"
     },
diff --git a/src/intel/common/mi_builder.h b/src/intel/common/mi_builder.h
index 6362f8fce6e..da29d48301e 100644
--- a/src/intel/common/mi_builder.h
+++ b/src/intel/common/mi_builder.h
@@ -1184,7 +1184,8 @@ _mi_resolve_address_token(struct mi_builder *b,
 {
    __gen_address_type addr = __gen_get_batch_address(b->user_data,
                                                     batch_location);
-   uint64_t addr_addr_u64 = __gen_combine_address(b->user_data, NULL, addr, 0);
+   uint64_t addr_addr_u64 = __gen_combine_address(b->user_data, batch_location,
+                                                  addr, 0);
    *(token.ptrs[0]) = addr_addr_u64;
    *(token.ptrs[1]) = addr_addr_u64 + 4;
 }