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

amdgpu/addrlib: Fix invalid access to m_tileTable 

Sometimes client driver passes valid tile info into address library,
in this case, the tile index is computed in function
HwlPostCheckTileIndex instead of CiAddrLib::HwlSetupTileCfg.
We need to call HwlPostCheckTileIndex to calculate the correct tile
index to get tile split bytes for this case.
This commit is contained in:
Nicolai Hähnle 2016-07-27 19:14:41 +02:00 committed by Marek Olšák
parent 9e40e09089
commit 4a4b7da141
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/amd/addrlib/r800/ciaddrlib.cpp
View File

@ -1277,14 +1277,25 @@ VOID CiAddrLib::HwlSetupTileInfo(
{
if (IsMacroTiled(tileMode))
{
// Non-depth entries store a split factor
UINT_32 sampleSplit = m_tileTable[pOut->tileIndex].info.tileSplitBytes;
UINT_32 tileBytes1x = BITS_TO_BYTES(bpp * MicroTilePixels * thickness);
UINT_32 colorTileSplit = Max(256u, sampleSplit * tileBytes1x);
UINT_32 tileIndex = static_cast<UINT_32>(pOut->tileIndex);
if (m_rowSize < colorTileSplit)
if ((tileIndex == TileIndexInvalid) && (IsTileInfoAllZero(pTileInfo) == FALSE))
{
pOut->tcCompatible = FALSE;
tileIndex = HwlPostCheckTileIndex(pTileInfo, tileMode, inTileType, tileIndex);
}
if (tileIndex != TileIndexInvalid)
{
ADDR_ASSERT(tileIndex < TileTableSize);
// Non-depth entries store a split factor
UINT_32 sampleSplit = m_tileTable[tileIndex].info.tileSplitBytes;
UINT_32 tileBytes1x = BITS_TO_BYTES(bpp * MicroTilePixels * thickness);
UINT_32 colorTileSplit = Max(256u, sampleSplit * tileBytes1x);
if (m_rowSize < colorTileSplit)
{
pOut->tcCompatible = FALSE;
}
}
}
else