diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-09-29 04:12:30 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-29 19:24:37 +0300 |
| commit | ce27643cc0f56f7a70de17c2ef54541ad4252c1a (patch) | |
| tree | bc54458eb718e90141c6a56c5258c8b01fecd747 /drivers/gpu | |
| parent | d81a2209498b6349a33f8741ca5a062dde84c043 (diff) | |
| download | linux-ce27643cc0f56f7a70de17c2ef54541ad4252c1a.tar.xz | |
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>
Diffstat (limited to 'drivers/gpu')
4 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h b/drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h index 243de293a3ef..e202e567faf4 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h +++ b/drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h @@ -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 }, diff --git a/drivers/gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h b/drivers/gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h index 76039860580d..8edd3e7860b7 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h +++ b/drivers/gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h @@ -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 }, diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c index 3820fe8f944a..289006b8d421 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c @@ -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) diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c index b73b2b445cee..f039320fa794 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c @@ -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) { |