Mesa (main): intel/aux_map: Replace magic number by INTEL_AUX_MAP_ENTRY_VALID_BIT

[GitLab Mirror]

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

Author: José Roberto de Souza <jose.so...@intel.com>
Date:   Fri Jul  7 10:04:25 2023 -0700

intel/aux_map: Replace magic number by INTEL_AUX_MAP_ENTRY_VALID_BIT

Signed-off-by: José Roberto de Souza <jose.so...@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24077>

---

 src/intel/common/intel_aux_map.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/intel/common/intel_aux_map.c b/src/intel/common/intel_aux_map.c
index 5e55c17d1d3..88ef98110a9 100644
--- a/src/intel/common/intel_aux_map.c
+++ b/src/intel/common/intel_aux_map.c
@@ -502,7 +502,7 @@ get_aux_entry(struct intel_aux_map_context *ctx, uint64_t 
address,
       } else {
          unreachable("Failed to add L2 Aux-Map Page Table!");
       }
-      *l3_entry = (l2_gpu & 0xffffffff8000ULL) | 1;
+      *l3_entry = (l2_gpu & 0xffffffff8000ULL) | INTEL_AUX_MAP_ENTRY_VALID_BIT;
    } else {
       uint64_t l2_addr = intel_canonical_address(*l3_entry & ~0x7fffULL);
       l2_map = get_u64_entry_ptr(ctx, l2_addr);
@@ -519,7 +519,7 @@ get_aux_entry(struct intel_aux_map_context *ctx, uint64_t 
address,
       } else {
          unreachable("Failed to add L1 Aux-Map Page Table!");
       }
-      *l2_entry = (l1_addr & ~get_page_mask(l1_page_size)) | 1;
+      *l2_entry = (l1_addr & ~get_page_mask(l1_page_size)) | 
INTEL_AUX_MAP_ENTRY_VALID_BIT;
    } else {
       l1_addr = intel_canonical_address(
             *l2_entry & ~get_page_mask(l1_page_size));
@@ -627,7 +627,7 @@ remove_mapping(struct intel_aux_map_context *ctx, uint64_t 
address,
    get_aux_entry(ctx, address, NULL, NULL, &l1_entry);
 
    const uint64_t current_l1_data = *l1_entry;
-   const uint64_t l1_data = current_l1_data & ~1ull;
+   const uint64_t l1_data = current_l1_data & ~INTEL_AUX_MAP_ENTRY_VALID_BIT;
 
    if ((current_l1_data & INTEL_AUX_MAP_ENTRY_VALID_BIT) == 0) {
       return;