Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

amdgpu/pp: use array_size to size the pwrvirus tables. 

This avoids fragile hardcoding of array size.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Dave Airlie 2017-09-29 11:12:30 +10:00 committed by Alex Deucher
parent d81a220949
commit ce27643cc0
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h
View File

@ -35,8 +35,7 @@ struct PWR_Command_Table
};
typedef struct PWR_Command_Table PWR_Command_Table;
#define PWR_VIRUS_TABLE_SIZE 10243
static const PWR_Command_Table PwrVirusTable[PWR_VIRUS_TABLE_SIZE] =
static const PWR_Command_Table PwrVirusTable[] =
{
{ 0x100100b6, mmPCIE_INDEX },
{ 0x00000000, mmPCIE_DATA },

5
drivers/gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h
View File

@ -36,10 +36,7 @@ struct PWR_Command_Table {
typedef struct PWR_Command_Table PWR_Command_Table;
#define PWR_VIRUS_TABLE_SIZE 10031
static const PWR_Command_Table pwr_virus_table[PWR_VIRUS_TABLE_SIZE] = {
static const PWR_Command_Table pwr_virus_table[] = {
{ 0x00000000, mmRLC_CNTL },
{ 0x00000002, mmRLC_SRM_CNTL },
{ 0x15000000, mmCP_ME_CNTL },

2
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
View File

@ -167,7 +167,7 @@ static int fiji_setup_pwr_virus(struct pp_hwmgr *hwmgr)
const PWR_Command_Table *pvirus = PwrVirusTable;
for (i = 0; i < PWR_VIRUS_TABLE_SIZE; i++) {
for (i = 0; i < ARRAY_SIZE(PwrVirusTable); i++) {
reg = pvirus->reg;
data = pvirus->data;
if (reg != 0xffffffff)

2
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
View File

@ -68,7 +68,7 @@ static int polaris10_setup_pwr_virus(struct pp_hwmgr *hwmgr)
const PWR_Command_Table *pvirus = pwr_virus_table;
for (i = 0; i < PWR_VIRUS_TABLE_SIZE; i++) {
for (i = 0; i < ARRAY_SIZE(pwr_virus_table); i++) {
reg = pvirus->reg;
data = pvirus->data;
if (reg != 0xffffffff) {