Mesa (master): amd: remove duplicated definitions from amdgpu_drm.h

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 127aaf0b9ac1eb46633df35c899b5d1a175a7220
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=127aaf0b9ac1eb46633df35c899b5d1a175a7220

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat May  2 09:10:42 2020 -0400

amd: remove duplicated definitions from amdgpu_drm.h

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4863>

---

 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c | 3 ---
 src/gallium/winsys/amdgpu/drm/amdgpu_bo.c     | 4 ----
 src/gallium/winsys/amdgpu/drm/amdgpu_cs.c     | 8 --------
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 4 ----
 4 files changed, 19 deletions(-)

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
index 99bd44226ae..6c243560347 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
@@ -40,9 +40,6 @@
 #include "util/u_memory.h"
 #include "util/u_math.h"
 
-#define AMDGPU_TILING_SCANOUT_SHIFT 63
-#define AMDGPU_TILING_SCANOUT_MASK 1
-
 static void radv_amdgpu_winsys_bo_destroy(struct radeon_winsys_bo *_bo);
 
 static int
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
index ec2fa3a56e4..6b030d2e487 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
@@ -1223,12 +1223,8 @@ static unsigned eg_tile_split_rev(unsigned eg_tile_split)
    }
 }
 
-#define AMDGPU_TILING_DCC_INDEPENDENT_128B_SHIFT	44
-#define AMDGPU_TILING_DCC_INDEPENDENT_128B_MASK		0x1
 #define AMDGPU_TILING_DCC_MAX_COMPRESSED_BLOCK_SIZE_SHIFT  45
 #define AMDGPU_TILING_DCC_MAX_COMPRESSED_BLOCK_SIZE_MASK   0x3
-#define AMDGPU_TILING_SCANOUT_SHIFT		63
-#define AMDGPU_TILING_SCANOUT_MASK		0x1
 
 static void amdgpu_buffer_get_metadata(struct pb_buffer *_buf,
                                        struct radeon_bo_metadata *md)
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
index 4308cfb3f96..ea2e372ceb8 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
@@ -35,14 +35,6 @@
 
 DEBUG_GET_ONCE_BOOL_OPTION(noop, "RADEON_NOOP", false)
 
-#ifndef AMDGPU_IB_FLAG_RESET_GDS_MAX_WAVE_ID
-#define AMDGPU_IB_FLAG_RESET_GDS_MAX_WAVE_ID  (1 << 4)
-#endif
-
-#ifndef AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES
-#define AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES	0x07
-#endif
-
 /* FENCES */
 
 static struct pipe_fence_handle *
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index a195dc8a136..b6cc0d0fd19 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -44,10 +44,6 @@
 #include "ac_llvm_util.h"
 #include "sid.h"
 
-#ifndef AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS
-#define AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS	0x1E
-#endif
-
 static struct hash_table *dev_tab = NULL;
 static simple_mtx_t dev_tab_mutex = _SIMPLE_MTX_INITIALIZER_NP;