fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

winsys/amdgpu: add addrlib support for Fiji (v2)

Browse source 
v2: fix tonga chip check

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: David Zhang <david1.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2015-07-07 22:18:13 -04:00 • committed by Marek Olšák
parent d69686f1d3
commit 528a6ff599
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.cpp
View file

@ -350,6 +350,7 @@ AddrChipFamily CIAddrLib::HwlConvertChipFamily(
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);
break;
case FAMILY_CZ:
m_settings.isCarrizo = 1;
@ -410,6 +411,10 @@ BOOL_32 CIAddrLib::HwlInitGlobalParams(
{
m_pipes = 2;
}
else if (m_settings.isFiji)
{
m_pipes = 16;
}
if (valid)
{

1
src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.h
View file

@ -59,6 +59,7 @@ struct CIChipSettings
UINT_32 isVolcanicIslands : 1;
UINT_32 isIceland : 1;
UINT_32 isTonga : 1;
UINT_32 isFiji : 1;
// VI fusion (Carrizo)
UINT_32 isCarrizo : 1;
};

6
src/gallium/winsys/amdgpu/drm/amdgpu_id.h
View file

@ -136,6 +136,8 @@ enum {
VI_TONGA_P_A0 = 20,
VI_TONGA_P_A1 = 21,
VI_FIJI_P_A0 = 60,
VI_UNKNOWN = 0xFF
};
@ -143,7 +145,9 @@ enum {
#define ASICREV_IS_ICELAND_M(eChipRev) \
(eChipRev < VI_TONGA_P_A0)
#define ASICREV_IS_TONGA_P(eChipRev) \
(eChipRev >= VI_TONGA_P_A0)
((eChipRev >= VI_TONGA_P_A0) && (eChipRev < VI_FIJI_P_A0))
#define ASICREV_IS_FIJI_P(eChipRev) \
(eChipRev >= VI_FIJI_P_A0)
/* CZ specific rev IDs */
enum {