From 532521adbc52a16cb25bc8e91833229cbcc838cf Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Wed, 23 Nov 2022 09:26:42 +0200
Subject: [PATCH] blorp: support negative offsets in addresses

Similar to anv_address

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 9c1c1888d989 ("intel/fs: put scratch surface in the surface state heap")
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19946>
(cherry picked from commit 20e8e1eb0658e68f44316e9ab27ddfa06096d66f)
---
 .pick_status.json       | 2 +-
 src/intel/blorp/blorp.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2b7ad4b3e1e..b765239c438 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -40,7 +40,7 @@
         "description": "blorp: support negative offsets in addresses",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9c1c1888d9895d05246005620953ee307d1a17f1"
     },
diff --git a/src/intel/blorp/blorp.h b/src/intel/blorp/blorp.h
index f8626c8bcc2..40560e3d6bc 100644
--- a/src/intel/blorp/blorp.h
+++ b/src/intel/blorp/blorp.h
@@ -122,7 +122,7 @@ void blorp_batch_finish(struct blorp_batch *batch);
 
 struct blorp_address {
    void *buffer;
-   uint64_t offset;
+   int64_t offset;
    unsigned reloc_flags;
    uint32_t mocs;