From 26cb93e229e3db3850c813f5fa156303a684c880 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Tue, 7 Nov 2017 02:01:40 +0100 Subject: radeonsi: add support for Raven2 (v2) v2: fix enabling primitive binning Reviewed-by: Samuel Pitoiset --- src/amd/addrlib/amdgpu_asic_addr.h | 2 ++ src/amd/addrlib/gfx9/gfx9addrlib.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/amd/addrlib') diff --git a/src/amd/addrlib/amdgpu_asic_addr.h b/src/amd/addrlib/amdgpu_asic_addr.h index e5838d42a3c..7436c5493e1 100644 --- a/src/amd/addrlib/amdgpu_asic_addr.h +++ b/src/amd/addrlib/amdgpu_asic_addr.h @@ -90,6 +90,7 @@ #define AMDGPU_VEGA20_RANGE 0x28, 0xFF #define AMDGPU_RAVEN_RANGE 0x01, 0x81 +#define AMDGPU_RAVEN2_RANGE 0x81, 0xFF #define AMDGPU_EXPAND_FIX(x) x #define AMDGPU_RANGE_HELPER(val, min, max) ((val >= min) && (val < max)) @@ -132,5 +133,6 @@ #define ASICREV_IS_VEGA20_P(r) ASICREV_IS(r, VEGA20) #define ASICREV_IS_RAVEN(r) ASICREV_IS(r, RAVEN) +#define ASICREV_IS_RAVEN2(r) ASICREV_IS(r, RAVEN2) #endif // _AMDGPU_ASIC_ADDR_H diff --git a/src/amd/addrlib/gfx9/gfx9addrlib.cpp b/src/amd/addrlib/gfx9/gfx9addrlib.cpp index d27aabbb60c..f115242c89c 100644 --- a/src/amd/addrlib/gfx9/gfx9addrlib.cpp +++ b/src/amd/addrlib/gfx9/gfx9addrlib.cpp @@ -1291,7 +1291,7 @@ ChipFamily Gfx9Lib::HwlConvertChipFamily( break; case FAMILY_RV: m_settings.isArcticIsland = 1; - m_settings.isRaven = ASICREV_IS_RAVEN(uChipRevision); + m_settings.isRaven = ASICREV_IS_RAVEN(uChipRevision) || ASICREV_IS_RAVEN2(uChipRevision); if (m_settings.isRaven) { -- cgit v1.2.3