summaryrefslogtreecommitdiffstats
path: root/src/amd
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2016-07-20 21:31:24 +0200
committerMarek Olšák <[email protected]>2017-03-30 14:44:33 +0200
commitb328e47d3d3cb71e3d5093d20f837fe36ee3bcc1 (patch)
treee4a5ae772a0a4daf2799bb97491ad1858f205908 /src/amd
parentfbc9ba7559b15d29cd8dc38dfb3751845ef3fd37 (diff)
amdgpu/addrlib: style cleanup
Signed-off-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/amd')
-rw-r--r--src/amd/addrlib/r800/ciaddrlib.cpp25
-rw-r--r--src/amd/addrlib/r800/egbaddrlib.cpp18
2 files changed, 15 insertions, 28 deletions
diff --git a/src/amd/addrlib/r800/ciaddrlib.cpp b/src/amd/addrlib/r800/ciaddrlib.cpp
index 3509024f76f..fccf09d0255 100644
--- a/src/amd/addrlib/r800/ciaddrlib.cpp
+++ b/src/amd/addrlib/r800/ciaddrlib.cpp
@@ -1205,7 +1205,7 @@ VOID CiLib::HwlSetupTileInfo(
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)
{
case 128:
@@ -1307,12 +1307,12 @@ VOID CiLib::HwlSetupTileInfo(
{
switch (tileMode)
{
- case ADDR_TM_1D_TILED_THICK:
- //special check for bonaire, for the compatablity between old KMD and new UMD for bonaire
+ case ADDR_TM_1D_TILED_THICK:
+ // special check for bonaire, for the compatablity between old KMD and new UMD
index = ((inTileType == ADDR_THICK) || m_settings.isBonaire) ? 19 : 18;
break;
- case ADDR_TM_2D_TILED_THICK:
- // special check for bonaire, for the compatablity between old KMD and new UMD for bonaire
+ case ADDR_TM_2D_TILED_THICK:
+ // special check for bonaire, for the compatablity between old KMD and new UMD
index = ((inTileType == ADDR_THICK) || m_settings.isBonaire) ? 20 : 24;
break;
case ADDR_TM_3D_TILED_THICK:
@@ -1401,7 +1401,7 @@ VOID CiLib::HwlSetupTileInfo(
{
macroModeIndex = HwlComputeMacroModeIndex(index, flags, bpp, numSamples, pTileInfo);
- /// Copy to pOut->tileType/tileIndex/macroModeIndex
+ // Copy to pOut->tileType/tileIndex/macroModeIndex
pOut->tileIndex = index;
pOut->tileType = m_tileTable[index].type; // Or inTileType, the samea
pOut->macroModeIndex = macroModeIndex;
@@ -1463,8 +1463,6 @@ VOID CiLib::HwlSetupTileInfo(
*
* @brief
* Convert GB_TILE_MODE HW value to ADDR_TILE_CONFIG.
-* @return
-* NA.
****************************************************************************************************
*/
VOID CiLib::ReadGbTileMode(
@@ -1608,8 +1606,6 @@ BOOL_32 CiLib::InitTileSettingTable(
*
* @brief
* Convert GB_MACRO_TILE_CFG HW value to ADDR_TILE_CONFIG.
-* @return
-* NA.
****************************************************************************************************
*/
VOID CiLib::ReadGbMacroTileCfg(
@@ -1780,9 +1776,6 @@ INT_32 CiLib::HwlComputeMacroModeIndex(
* @brief
* Compute the squared cache shape for per-tile data (CMASK and HTILE) for linear layout
*
-* @return
-* N/A
-*
* @note
* MacroWidth and macroHeight are measured in pixels
****************************************************************************************************
@@ -1946,9 +1939,6 @@ UINT_64 CiLib::HwlComputeMetadataNibbleAddress(
* @brief
* Hardware layer function to compute alignment request for macro tile mode
*
-* @return
-* N/A
-*
****************************************************************************************************
*/
VOID CiLib::HwlComputeSurfaceAlignmentsMacroTiled(
@@ -1981,9 +1971,6 @@ VOID CiLib::HwlComputeSurfaceAlignmentsMacroTiled(
* @brief
* Helper function to pad dimensions
*
-* @return
-* N/A
-*
****************************************************************************************************
*/
VOID CiLib::HwlPadDimensions(
diff --git a/src/amd/addrlib/r800/egbaddrlib.cpp b/src/amd/addrlib/r800/egbaddrlib.cpp
index 9655c47f7a8..f413cfffda9 100644
--- a/src/amd/addrlib/r800/egbaddrlib.cpp
+++ b/src/amd/addrlib/r800/egbaddrlib.cpp
@@ -892,19 +892,19 @@ BOOL_32 EgBasedLib::ComputeSurfaceAlignmentsMacroTiled(
{
// this restriction is only for mipmap (mipmap's numSamples must be 1)
macroAspectAlign = Max(1u,
- m_pipeInterleaveBytes * m_bankInterleave /
- (tileSize * pipes * pTileInfo->bankWidth)
- );
+ m_pipeInterleaveBytes * m_bankInterleave /
+ (tileSize * pipes * pTileInfo->bankWidth)
+ );
pTileInfo->macroAspectRatio = PowTwoAlign(pTileInfo->macroAspectRatio, macroAspectAlign);
}
valid = HwlReduceBankWidthHeight(tileSize,
- bpp,
- flags,
- numSamples,
- bankHeightAlign,
- pipes,
- pTileInfo);
+ bpp,
+ flags,
+ numSamples,
+ bankHeightAlign,
+ pipes,
+ pTileInfo);
//
// The required granularity for pitch is the macro tile width.