amd/addrlib: fix another C++ one definition rule violation

Clashes with the SI definition.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3116
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5673>

diff --git a/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h b/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h
index 8526171c7bcda206555b3580137471d7ec36fdf0..93f250716b6298a2acc00cc08fb9b33416cc17df 100644 (file)
--- a/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h
+++ b/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h
@@ -45,7 +45,7 @@
 #define BIGENDIAN_CPU
 #endif
 
 #define BIGENDIAN_CPU
 #endif
 

-union GB_ADDR_CONFIG
+union GB_ADDR_CONFIG_gfx10

 {
     struct
     {
 {
     struct
     {

diff --git a/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp b/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp
index 4033c2398d7b9e29c23958c17817510a31dbfe4d..ec05f3a3dd8cf659d664966b45e1c7f67ab9f2e6 100644 (file)
--- a/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp
+++ b/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp
@@ -755,7 +755,7 @@ BOOL_32 Gfx10Lib::HwlInitGlobalParams(
     const ADDR_CREATE_INPUT* pCreateIn) ///< [in] create input
 {
     BOOL_32        valid = TRUE;
     const ADDR_CREATE_INPUT* pCreateIn) ///< [in] create input
 {
     BOOL_32        valid = TRUE;

-    GB_ADDR_CONFIG gbAddrConfig;
+    GB_ADDR_CONFIG_gfx10 gbAddrConfig;

 
     gbAddrConfig.u32All = pCreateIn->regValue.gbAddrConfig;
 
 
     gbAddrConfig.u32All = pCreateIn->regValue.gbAddrConfig;