Mesa (main): anv: Optimize anv_address_physical when ANV_ALWAYS_SOFTPIN

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: c7e1488037e863b45f993e0828f8e0ebf26f9e94
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7e1488037e863b45f993e0828f8e0ebf26f9e94

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Jun  8 09:25:57 2021 -0500

anv: Optimize anv_address_physical when ANV_ALWAYS_SOFTPIN

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11236>

---

 src/intel/vulkan/anv_private.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index f5716efba53..6ec8f31047c 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -1643,10 +1643,13 @@ anv_address_is_null(struct anv_address addr)
 static inline uint64_t
 anv_address_physical(struct anv_address addr)
 {
-   if (addr.bo && (addr.bo->flags & EXEC_OBJECT_PINNED))
+   if (addr.bo && (ANV_ALWAYS_SOFTPIN ||
+                   (addr.bo->flags & EXEC_OBJECT_PINNED))) {
+      assert(addr.bo->flags & EXEC_OBJECT_PINNED);
       return intel_canonical_address(addr.bo->offset + addr.offset);
-   else
+   } else {
       return intel_canonical_address(addr.offset);
+   }
 }
 
 static inline struct anv_address