Mesa (staging/22.0): anv: Align GENERAL_STATE_POOL_MIN_ADDRESS to 2MiB

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: de55b090e401efa0cde03b1f4aecbcb08d040936
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de55b090e401efa0cde03b1f4aecbcb08d040936

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Tue Feb 15 10:43:23 2022 -0800

anv: Align GENERAL_STATE_POOL_MIN_ADDRESS to 2MiB

Fixes: c17e2216dd5 ("anv: Align buffer VMA to 2MiB for XeHP")
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15054>
(cherry picked from commit 5a28d2482f65209d376521be37e1ff0024fee4b1)

---

 .pick_status.json              | 2 +-
 src/intel/vulkan/anv_private.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9d146fa6bd1..dfd3d1fb9b8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -643,7 +643,7 @@
         "description": "anv: Align GENERAL_STATE_POOL_MIN_ADDRESS to 2MiB",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c17e2216dd5f2ace77e44a8008b2b177d633b05e"
     },
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index b205e5b266d..b8e16d17199 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -139,7 +139,7 @@ struct intel_perf_query_result;
  * various reasons. This healthy margin prevents reads from wrapping around
  * 48-bit addresses.
  */
-#define GENERAL_STATE_POOL_MIN_ADDRESS     0x000000010000ULL /* 64 KiB */
+#define GENERAL_STATE_POOL_MIN_ADDRESS     0x000000200000ULL /* 2 MiB */
 #define GENERAL_STATE_POOL_MAX_ADDRESS     0x00003fffffffULL
 #define LOW_HEAP_MIN_ADDRESS               0x000040000000ULL /* 1 GiB */
 #define LOW_HEAP_MAX_ADDRESS               0x00007fffffffULL