amdgpu/addrlib: style cleanup

Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Nicolai Hähnle
2016-07-20 21:31:24 +02:00
committed by Marek Olšák
parent fbc9ba7559
commit b328e47d3d
2 changed files with 15 additions and 28 deletions

View File

@@ -1205,7 +1205,7 @@ VOID CiLib::HwlSetupTileInfo(
if (flags.depth && (flags.nonSplit || flags.tcCompatible || flags.needEquation)) if (flags.depth && (flags.nonSplit || flags.tcCompatible || flags.needEquation))
{ {
// Texure readable depth surface should not be split // Texture readable depth surface should not be split
switch (tileSize) switch (tileSize)
{ {
case 128: case 128:
@@ -1307,12 +1307,12 @@ VOID CiLib::HwlSetupTileInfo(
{ {
switch (tileMode) switch (tileMode)
{ {
case ADDR_TM_1D_TILED_THICK: case ADDR_TM_1D_TILED_THICK:
//special check for bonaire, for the compatablity between old KMD and new UMD for bonaire // special check for bonaire, for the compatablity between old KMD and new UMD
index = ((inTileType == ADDR_THICK) || m_settings.isBonaire) ? 19 : 18; index = ((inTileType == ADDR_THICK) || m_settings.isBonaire) ? 19 : 18;
break; break;
case ADDR_TM_2D_TILED_THICK: case ADDR_TM_2D_TILED_THICK:
// special check for bonaire, for the compatablity between old KMD and new UMD for bonaire // special check for bonaire, for the compatablity between old KMD and new UMD
index = ((inTileType == ADDR_THICK) || m_settings.isBonaire) ? 20 : 24; index = ((inTileType == ADDR_THICK) || m_settings.isBonaire) ? 20 : 24;
break; break;
case ADDR_TM_3D_TILED_THICK: case ADDR_TM_3D_TILED_THICK:
@@ -1401,7 +1401,7 @@ VOID CiLib::HwlSetupTileInfo(
{ {
macroModeIndex = HwlComputeMacroModeIndex(index, flags, bpp, numSamples, pTileInfo); macroModeIndex = HwlComputeMacroModeIndex(index, flags, bpp, numSamples, pTileInfo);
/// Copy to pOut->tileType/tileIndex/macroModeIndex // Copy to pOut->tileType/tileIndex/macroModeIndex
pOut->tileIndex = index; pOut->tileIndex = index;
pOut->tileType = m_tileTable[index].type; // Or inTileType, the samea pOut->tileType = m_tileTable[index].type; // Or inTileType, the samea
pOut->macroModeIndex = macroModeIndex; pOut->macroModeIndex = macroModeIndex;
@@ -1463,8 +1463,6 @@ VOID CiLib::HwlSetupTileInfo(
* *
* @brief * @brief
* Convert GB_TILE_MODE HW value to ADDR_TILE_CONFIG. * Convert GB_TILE_MODE HW value to ADDR_TILE_CONFIG.
* @return
* NA.
**************************************************************************************************** ****************************************************************************************************
*/ */
VOID CiLib::ReadGbTileMode( VOID CiLib::ReadGbTileMode(
@@ -1608,8 +1606,6 @@ BOOL_32 CiLib::InitTileSettingTable(
* *
* @brief * @brief
* Convert GB_MACRO_TILE_CFG HW value to ADDR_TILE_CONFIG. * Convert GB_MACRO_TILE_CFG HW value to ADDR_TILE_CONFIG.
* @return
* NA.
**************************************************************************************************** ****************************************************************************************************
*/ */
VOID CiLib::ReadGbMacroTileCfg( VOID CiLib::ReadGbMacroTileCfg(
@@ -1780,9 +1776,6 @@ INT_32 CiLib::HwlComputeMacroModeIndex(
* @brief * @brief
* Compute the squared cache shape for per-tile data (CMASK and HTILE) for linear layout * Compute the squared cache shape for per-tile data (CMASK and HTILE) for linear layout
* *
* @return
* N/A
*
* @note * @note
* MacroWidth and macroHeight are measured in pixels * MacroWidth and macroHeight are measured in pixels
**************************************************************************************************** ****************************************************************************************************
@@ -1946,9 +1939,6 @@ UINT_64 CiLib::HwlComputeMetadataNibbleAddress(
* @brief * @brief
* Hardware layer function to compute alignment request for macro tile mode * Hardware layer function to compute alignment request for macro tile mode
* *
* @return
* N/A
*
**************************************************************************************************** ****************************************************************************************************
*/ */
VOID CiLib::HwlComputeSurfaceAlignmentsMacroTiled( VOID CiLib::HwlComputeSurfaceAlignmentsMacroTiled(
@@ -1981,9 +1971,6 @@ VOID CiLib::HwlComputeSurfaceAlignmentsMacroTiled(
* @brief * @brief
* Helper function to pad dimensions * Helper function to pad dimensions
* *
* @return
* N/A
*
**************************************************************************************************** ****************************************************************************************************
*/ */
VOID CiLib::HwlPadDimensions( VOID CiLib::HwlPadDimensions(

View File

@@ -892,19 +892,19 @@ BOOL_32 EgBasedLib::ComputeSurfaceAlignmentsMacroTiled(
{ {
// this restriction is only for mipmap (mipmap's numSamples must be 1) // this restriction is only for mipmap (mipmap's numSamples must be 1)
macroAspectAlign = Max(1u, macroAspectAlign = Max(1u,
m_pipeInterleaveBytes * m_bankInterleave / m_pipeInterleaveBytes * m_bankInterleave /
(tileSize * pipes * pTileInfo->bankWidth) (tileSize * pipes * pTileInfo->bankWidth)
); );
pTileInfo->macroAspectRatio = PowTwoAlign(pTileInfo->macroAspectRatio, macroAspectAlign); pTileInfo->macroAspectRatio = PowTwoAlign(pTileInfo->macroAspectRatio, macroAspectAlign);
} }
valid = HwlReduceBankWidthHeight(tileSize, valid = HwlReduceBankWidthHeight(tileSize,
bpp, bpp,
flags, flags,
numSamples, numSamples,
bankHeightAlign, bankHeightAlign,
pipes, pipes,
pTileInfo); pTileInfo);
// //
// The required granularity for pitch is the macro tile width. // The required granularity for pitch is the macro tile width.