2023-08-01 09:04:16

by Ran Sun

[permalink] [raw]
Subject: [PATCH] drm/amd: Clean up errors in smu7_hwmgr.c

Fix the following errors reported by checkpatch:

ERROR: that open brace { should be on the previous line
ERROR: spaces required around that '=' (ctx:VxV)
ERROR: spaces required around that '<' (ctx:VxV)

Signed-off-by: Ran Sun <[email protected]>
---
.../drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
index 1cb402264497..425859682fab 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
@@ -83,15 +83,15 @@
#define PCIE_BUS_CLK 10000
#define TCLK (PCIE_BUS_CLK / 10)

-static struct profile_mode_setting smu7_profiling[7] =
- {{0, 0, 0, 0, 0, 0, 0, 0},
+static struct profile_mode_setting smu7_profiling[7] = {
+ {0, 0, 0, 0, 0, 0, 0, 0},
{1, 0, 100, 30, 1, 0, 100, 10},
{1, 10, 0, 30, 0, 0, 0, 0},
{0, 0, 0, 0, 1, 10, 16, 31},
{1, 0, 11, 50, 1, 0, 100, 10},
{1, 0, 5, 30, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, 0, 0},
- };
+};

#define PPSMC_MSG_SetVBITimeout_VEGAM ((uint16_t) 0x310)

@@ -950,7 +950,7 @@ static int smu7_odn_initial_default_setting(struct pp_hwmgr *hwmgr)
odn_table->odn_core_clock_dpm_levels.num_of_pl =
data->golden_dpm_table.sclk_table.count;
entries = odn_table->odn_core_clock_dpm_levels.entries;
- for (i=0; i<data->golden_dpm_table.sclk_table.count; i++) {
+ for (i = 0; i < data->golden_dpm_table.sclk_table.count; i++) {
entries[i].clock = data->golden_dpm_table.sclk_table.dpm_levels[i].value;
entries[i].enabled = true;
entries[i].vddc = dep_sclk_table->entries[i].vddc;
@@ -962,7 +962,7 @@ static int smu7_odn_initial_default_setting(struct pp_hwmgr *hwmgr)
odn_table->odn_memory_clock_dpm_levels.num_of_pl =
data->golden_dpm_table.mclk_table.count;
entries = odn_table->odn_memory_clock_dpm_levels.entries;
- for (i=0; i<data->golden_dpm_table.mclk_table.count; i++) {
+ for (i = 0; i < data->golden_dpm_table.mclk_table.count; i++) {
entries[i].clock = data->golden_dpm_table.mclk_table.dpm_levels[i].value;
entries[i].enabled = true;
entries[i].vddc = dep_mclk_table->entries[i].vddc;
@@ -1813,13 +1813,13 @@ static void smu7_init_dpm_defaults(struct pp_hwmgr *hwmgr)
data->static_screen_threshold = SMU7_STATICSCREENTHRESHOLD_DFLT;
data->static_screen_threshold_unit = SMU7_STATICSCREENTHRESHOLDUNIT_DFLT;
data->voting_rights_clients[0] = SMU7_VOTINGRIGHTSCLIENTS_DFLT0;
- data->voting_rights_clients[1]= SMU7_VOTINGRIGHTSCLIENTS_DFLT1;
+ data->voting_rights_clients[1] = SMU7_VOTINGRIGHTSCLIENTS_DFLT1;
data->voting_rights_clients[2] = SMU7_VOTINGRIGHTSCLIENTS_DFLT2;
- data->voting_rights_clients[3]= SMU7_VOTINGRIGHTSCLIENTS_DFLT3;
- data->voting_rights_clients[4]= SMU7_VOTINGRIGHTSCLIENTS_DFLT4;
- data->voting_rights_clients[5]= SMU7_VOTINGRIGHTSCLIENTS_DFLT5;
- data->voting_rights_clients[6]= SMU7_VOTINGRIGHTSCLIENTS_DFLT6;
- data->voting_rights_clients[7]= SMU7_VOTINGRIGHTSCLIENTS_DFLT7;
+ data->voting_rights_clients[3] = SMU7_VOTINGRIGHTSCLIENTS_DFLT3;
+ data->voting_rights_clients[4] = SMU7_VOTINGRIGHTSCLIENTS_DFLT4;
+ data->voting_rights_clients[5] = SMU7_VOTINGRIGHTSCLIENTS_DFLT5;
+ data->voting_rights_clients[6] = SMU7_VOTINGRIGHTSCLIENTS_DFLT6;
+ data->voting_rights_clients[7] = SMU7_VOTINGRIGHTSCLIENTS_DFLT7;

data->mclk_dpm_key_disabled = hwmgr->feature_mask & PP_MCLK_DPM_MASK ? false : true;
data->sclk_dpm_key_disabled = hwmgr->feature_mask & PP_SCLK_DPM_MASK ? false : true;
@@ -2002,7 +2002,7 @@ static int smu7_calculate_ro_range(struct pp_hwmgr *hwmgr)
} else if (ASICID_IS_P21(adev->pdev->device, adev->pdev->revision) ||
ASICID_IS_P31(adev->pdev->device, adev->pdev->revision)) {
min = 900;
- max= 2100;
+ max = 2100;
} else if (hwmgr->chip_id == CHIP_POLARIS10) {
if (adev->pdev->subsystem_vendor == 0x106B) {
min = 1000;
@@ -4018,7 +4018,7 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx,
offset = data->soft_regs_start + smum_get_offsetof(hwmgr,
SMU_SoftRegisters,
(idx == AMDGPU_PP_SENSOR_GPU_LOAD) ?
- AverageGraphicsActivity:
+ AverageGraphicsActivity :
AverageMemoryActivity);

activity_percent = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, offset);
--
2.17.1



2023-08-07 16:59:07

by Alex Deucher

[permalink] [raw]
Subject: Re: [PATCH] drm/amd: Clean up errors in smu7_hwmgr.c

Applied. Thanks!

On Tue, Aug 1, 2023 at 5:00 AM Ran Sun <[email protected]> wrote:
>
> Fix the following errors reported by checkpatch:
>
> ERROR: that open brace { should be on the previous line
> ERROR: spaces required around that '=' (ctx:VxV)
> ERROR: spaces required around that '<' (ctx:VxV)
>
> Signed-off-by: Ran Sun <[email protected]>
> ---
> .../drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 26 +++++++++----------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
> index 1cb402264497..425859682fab 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
> @@ -83,15 +83,15 @@
> #define PCIE_BUS_CLK 10000
> #define TCLK (PCIE_BUS_CLK / 10)
>
> -static struct profile_mode_setting smu7_profiling[7] =
> - {{0, 0, 0, 0, 0, 0, 0, 0},
> +static struct profile_mode_setting smu7_profiling[7] = {
> + {0, 0, 0, 0, 0, 0, 0, 0},
> {1, 0, 100, 30, 1, 0, 100, 10},
> {1, 10, 0, 30, 0, 0, 0, 0},
> {0, 0, 0, 0, 1, 10, 16, 31},
> {1, 0, 11, 50, 1, 0, 100, 10},
> {1, 0, 5, 30, 0, 0, 0, 0},
> {0, 0, 0, 0, 0, 0, 0, 0},
> - };
> +};
>
> #define PPSMC_MSG_SetVBITimeout_VEGAM ((uint16_t) 0x310)
>
> @@ -950,7 +950,7 @@ static int smu7_odn_initial_default_setting(struct pp_hwmgr *hwmgr)
> odn_table->odn_core_clock_dpm_levels.num_of_pl =
> data->golden_dpm_table.sclk_table.count;
> entries = odn_table->odn_core_clock_dpm_levels.entries;
> - for (i=0; i<data->golden_dpm_table.sclk_table.count; i++) {
> + for (i = 0; i < data->golden_dpm_table.sclk_table.count; i++) {
> entries[i].clock = data->golden_dpm_table.sclk_table.dpm_levels[i].value;
> entries[i].enabled = true;
> entries[i].vddc = dep_sclk_table->entries[i].vddc;
> @@ -962,7 +962,7 @@ static int smu7_odn_initial_default_setting(struct pp_hwmgr *hwmgr)
> odn_table->odn_memory_clock_dpm_levels.num_of_pl =
> data->golden_dpm_table.mclk_table.count;
> entries = odn_table->odn_memory_clock_dpm_levels.entries;
> - for (i=0; i<data->golden_dpm_table.mclk_table.count; i++) {
> + for (i = 0; i < data->golden_dpm_table.mclk_table.count; i++) {
> entries[i].clock = data->golden_dpm_table.mclk_table.dpm_levels[i].value;
> entries[i].enabled = true;
> entries[i].vddc = dep_mclk_table->entries[i].vddc;
> @@ -1813,13 +1813,13 @@ static void smu7_init_dpm_defaults(struct pp_hwmgr *hwmgr)
> data->static_screen_threshold = SMU7_STATICSCREENTHRESHOLD_DFLT;
> data->static_screen_threshold_unit = SMU7_STATICSCREENTHRESHOLDUNIT_DFLT;
> data->voting_rights_clients[0] = SMU7_VOTINGRIGHTSCLIENTS_DFLT0;
> - data->voting_rights_clients[1]= SMU7_VOTINGRIGHTSCLIENTS_DFLT1;
> + data->voting_rights_clients[1] = SMU7_VOTINGRIGHTSCLIENTS_DFLT1;
> data->voting_rights_clients[2] = SMU7_VOTINGRIGHTSCLIENTS_DFLT2;
> - data->voting_rights_clients[3]= SMU7_VOTINGRIGHTSCLIENTS_DFLT3;
> - data->voting_rights_clients[4]= SMU7_VOTINGRIGHTSCLIENTS_DFLT4;
> - data->voting_rights_clients[5]= SMU7_VOTINGRIGHTSCLIENTS_DFLT5;
> - data->voting_rights_clients[6]= SMU7_VOTINGRIGHTSCLIENTS_DFLT6;
> - data->voting_rights_clients[7]= SMU7_VOTINGRIGHTSCLIENTS_DFLT7;
> + data->voting_rights_clients[3] = SMU7_VOTINGRIGHTSCLIENTS_DFLT3;
> + data->voting_rights_clients[4] = SMU7_VOTINGRIGHTSCLIENTS_DFLT4;
> + data->voting_rights_clients[5] = SMU7_VOTINGRIGHTSCLIENTS_DFLT5;
> + data->voting_rights_clients[6] = SMU7_VOTINGRIGHTSCLIENTS_DFLT6;
> + data->voting_rights_clients[7] = SMU7_VOTINGRIGHTSCLIENTS_DFLT7;
>
> data->mclk_dpm_key_disabled = hwmgr->feature_mask & PP_MCLK_DPM_MASK ? false : true;
> data->sclk_dpm_key_disabled = hwmgr->feature_mask & PP_SCLK_DPM_MASK ? false : true;
> @@ -2002,7 +2002,7 @@ static int smu7_calculate_ro_range(struct pp_hwmgr *hwmgr)
> } else if (ASICID_IS_P21(adev->pdev->device, adev->pdev->revision) ||
> ASICID_IS_P31(adev->pdev->device, adev->pdev->revision)) {
> min = 900;
> - max= 2100;
> + max = 2100;
> } else if (hwmgr->chip_id == CHIP_POLARIS10) {
> if (adev->pdev->subsystem_vendor == 0x106B) {
> min = 1000;
> @@ -4018,7 +4018,7 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx,
> offset = data->soft_regs_start + smum_get_offsetof(hwmgr,
> SMU_SoftRegisters,
> (idx == AMDGPU_PP_SENSOR_GPU_LOAD) ?
> - AverageGraphicsActivity:
> + AverageGraphicsActivity :
> AverageMemoryActivity);
>
> activity_percent = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, offset);
> --
> 2.17.1
>