From c14857e915da9232e618ec1a8cb1cb968fc7e590 Mon Sep 17 00:00:00 2001
From: Jianxun Zhang <jianxun.zhang@intel.com>
Date: Sun, 13 Nov 2022 12:44:49 -0800
Subject: [PATCH] intel/common: clean up AUX macros

The hardcoded is either replaced with new interfaces or relocated
to C file if it is private.

Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20259>
---
 src/intel/common/intel_aux_map.c | 2 ++
 src/intel/common/intel_aux_map.h | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/intel/common/intel_aux_map.c b/src/intel/common/intel_aux_map.c
index 02a5314..208723e 100644
--- a/src/intel/common/intel_aux_map.c
+++ b/src/intel/common/intel_aux_map.c
@@ -94,6 +94,8 @@
 #include <stdio.h>
 #include <pthread.h>
 
+#define INTEL_AUX_MAP_FORMAT_BITS_MASK   0xfff0000000000000ull
+
 static const bool aux_map_debug = false;
 
 /**
diff --git a/src/intel/common/intel_aux_map.h b/src/intel/common/intel_aux_map.h
index 8b292c5..8e7882d 100644
--- a/src/intel/common/intel_aux_map.h
+++ b/src/intel/common/intel_aux_map.h
@@ -43,13 +43,7 @@ extern "C" {
 struct intel_aux_map_context;
 struct intel_device_info;
 
-#define INTEL_AUX_MAP_ADDRESS_MASK       0x0000ffffffffff00ull
-#define INTEL_AUX_MAP_FORMAT_BITS_MASK   0xfff0000000000000ull
 #define INTEL_AUX_MAP_ENTRY_VALID_BIT    0x1ull
-#define INTEL_AUX_MAP_GFX12_CCS_SCALE    256
-#define INTEL_AUX_MAP_MAIN_PAGE_SIZE     (64 * 1024)
-#define INTEL_AUX_MAP_AUX_PAGE_SIZE \
-   (INTEL_AUX_MAP_MAIN_PAGE_SIZE / INTEL_AUX_MAP_GFX12_CCS_SCALE)
 
 struct intel_aux_map_context *
 intel_aux_map_init(void *driver_ctx,
-- 
2.7.4