intel/aux_map: Replace magic number by INTEL_AUX_MAP_ENTRY_VALID_BIT

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24077>
This commit is contained in:
José Roberto de Souza 2023-07-07 10:04:25 -07:00 committed by Marge Bot
parent 4fc38aa99b
commit 14ae2c58b8

View file

@ -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;