[Mesa-dev] [PATCH 038/140] amdgpu/addrlib: Fix family setting for VI and CZ ASICs

[Marek Olšák]

From: Frans Gu <frans.gu at amd.com>

---
 src/amd/addrlib/r800/ciaddrlib.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/amd/addrlib/r800/ciaddrlib.cpp b/src/amd/addrlib/r800/ciaddrlib.cpp
index fccf09d..e5dfea2 100644
--- a/src/amd/addrlib/r800/ciaddrlib.cpp
+++ b/src/amd/addrlib/r800/ciaddrlib.cpp
@@ -403,24 +403,26 @@ ChipFamily CiLib::HwlConvertChipFamily(
             m_settings.isKalindi    = ASICREV_IS_KALINDI(uChipRevision);
             break;
         case FAMILY_VI:
             m_settings.isVolcanicIslands = 1;
             m_settings.isIceland         = ASICREV_IS_ICELAND_M(uChipRevision);
             m_settings.isTonga           = ASICREV_IS_TONGA_P(uChipRevision);
             m_settings.isFiji            = ASICREV_IS_FIJI_P(uChipRevision);
             m_settings.isPolaris10       = ASICREV_IS_POLARIS10_P(uChipRevision);
             m_settings.isPolaris11       = ASICREV_IS_POLARIS11_M(uChipRevision);
             m_settings.isPolaris12       = ASICREV_IS_POLARIS12_V(uChipRevision);
+            family = ADDR_CHIP_FAMILY_VI;
             break;
         case FAMILY_CZ:
             m_settings.isCarrizo         = 1;
             m_settings.isVolcanicIslands = 1;
+            family = ADDR_CHIP_FAMILY_VI;
             break;
         default:
             ADDR_ASSERT(!"This should be a unexpected Fusion");
             break;
     }
 
     return family;
 }
 
 /**
-- 
2.7.4