KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

winsys/amdgpu: addrlib - port a Fiji bug fix 

Fiji: Fixed tiled resource failures

Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>

v2: fix a compile failure (typo) - Marek
This commit is contained in:
Sonny Jiang 2015-11-10 16:07:43 -05:00 committed by Marek Olšák
parent 338d7bf053
commit 2618886600
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.cpp
View File

@ -894,6 +894,49 @@ BOOL_32 CIAddrLib::HwlOverrideTileMode(
return bOverrided;
}
/**
***************************************************************************************************
* CiAddrLib::GetPrtSwitchP4Threshold
*
* @brief
* Return the threshold of switching to P4_* instead of P16_* for PRT resources
***************************************************************************************************
*/
UINT_32 CIAddrLib::GetPrtSwitchP4Threshold() const
{
UINT_32 threshold;
switch (m_pipes)
{
case 8:
threshold = 32;
break;
case 16:
if (m_settings.isFiji)
{
threshold = 16;
}
else if (m_settings.isHawaii)
{
threshold = 8;
}
else
{
///@todo add for possible new ASICs.
ADDR_ASSERT_ALWAYS();
threshold = 16;
}
break;
default:
///@todo add for possible new ASICs.
ADDR_ASSERT_ALWAYS();
threshold = 32;
break;
}
return threshold;
}
/**
***************************************************************************************************
* CIAddrLib::HwlSetupTileInfo
@ -1123,7 +1166,7 @@ VOID CIAddrLib::HwlSetupTileInfo(
{
UINT_32 bytesXSamples = bpp * numSamples / 8;
UINT_32 bytesXThickness = bpp * thickness / 8;
UINT_32 switchP4Threshold = (m_pipes == 16) ? 8 : 32;
UINT_32 switchP4Threshold = GetPrtSwitchP4Threshold();
if ((bytesXSamples > switchP4Threshold) || (bytesXThickness > switchP4Threshold))
{

2
src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.h
View File

@ -167,6 +167,8 @@ private:
VOID ReadGbMacroTileCfg(
UINT_32 regValue, ADDR_TILEINFO* pCfg) const;
UINT_32 GetPrtSwitchP4Threshold() const;
BOOL_32 InitTileSettingTable(
const UINT_32 *pSetting, UINT_32 noOfEntries);