From: Frans Gu <frans.gu@amd.com>
Date: Thu, 22 Oct 2015 06:11:51 +0000 (-0400)
Subject: amdgpu/addrlib: Fix family setting for VI and CZ ASICs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c867a2b22268eadb9cf1a899fae0736adcbab7bc;p=mesa.git

amdgpu/addrlib: Fix family setting for VI and CZ ASICs
---

diff --git a/src/amd/addrlib/r800/ciaddrlib.cpp b/src/amd/addrlib/r800/ciaddrlib.cpp
index fccf09d0255..e5dfea2902b 100644
--- a/src/amd/addrlib/r800/ciaddrlib.cpp
+++ b/src/amd/addrlib/r800/ciaddrlib.cpp
@@ -410,10 +410,12 @@ ChipFamily CiLib::HwlConvertChipFamily(
             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");