Re: [PATCH] drm/amd/pm: Clean up errors in fiji_baco.c

From: Alex Deucher
Date: Mon Aug 07 2023 - 12:28:57 EST


Applied. Thanks!

On Mon, Jul 31, 2023 at 11:16 PM Ran Sun <sunran001@xxxxxxxxxx> wrote:
>
> Fix the following errors reported by checkpatch:
>
> ERROR: that open brace { should be on the previous line
>
> Signed-off-by: Ran Sun <sunran001@xxxxxxxxxx>
> ---
> .../drm/amd/pm/powerplay/hwmgr/fiji_baco.c | 24 +++++++------------
> 1 file changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/fiji_baco.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/fiji_baco.c
> index c0368f2dfb21..b3e768fa79f2 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/fiji_baco.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/fiji_baco.c
> @@ -36,8 +36,7 @@
> #include "smu/smu_7_1_3_sh_mask.h"
>
>
> -static const struct baco_cmd_entry gpio_tbl[] =
> -{
> +static const struct baco_cmd_entry gpio_tbl[] = {
> { CMD_WRITE, mmGPIOPAD_EN, 0, 0, 0, 0x0 },
> { CMD_WRITE, mmGPIOPAD_PD_EN, 0, 0, 0, 0x0 },
> { CMD_WRITE, mmGPIOPAD_PU_EN, 0, 0, 0, 0x0 },
> @@ -50,15 +49,13 @@ static const struct baco_cmd_entry gpio_tbl[] =
> { CMD_READMODIFYWRITE, mmDC_GPIO_SYNCA_MASK, 0, 0, 0, 0x00001111 }
> };
>
> -static const struct baco_cmd_entry enable_fb_req_rej_tbl[] =
> -{
> +static const struct baco_cmd_entry enable_fb_req_rej_tbl[] = {
> { CMD_WRITE, mmGCK_SMC_IND_INDEX, 0, 0, 0, 0xC0300024 },
> { CMD_READMODIFYWRITE, mmGCK_SMC_IND_DATA, 0x1, 0x0, 0, 0x1 },
> { CMD_WRITE, mmBIF_FB_EN, 0, 0, 0, 0x0 }
> };
>
> -static const struct baco_cmd_entry use_bclk_tbl[] =
> -{
> +static const struct baco_cmd_entry use_bclk_tbl[] = {
> { CMD_WRITE, mmGCK_SMC_IND_INDEX, 0, 0, 0, ixCG_SPLL_FUNC_CNTL },
> { CMD_READMODIFYWRITE, mmGCK_SMC_IND_DATA, CG_SPLL_FUNC_CNTL__SPLL_BYPASS_EN_MASK, CG_SPLL_FUNC_CNTL__SPLL_BYPASS_EN__SHIFT, 0, 0x1 },
> { CMD_WRITE, mmGCK_SMC_IND_INDEX, 0, 0, 0, ixCG_SPLL_FUNC_CNTL_2 },
> @@ -78,8 +75,7 @@ static const struct baco_cmd_entry use_bclk_tbl[] =
> { CMD_READMODIFYWRITE, mmGCK_SMC_IND_DATA, MPLL_BYPASSCLK_SEL__MPLL_CLKOUT_SEL_MASK, MPLL_BYPASSCLK_SEL__MPLL_CLKOUT_SEL__SHIFT, 0, 0x2 }
> };
>
> -static const struct baco_cmd_entry turn_off_plls_tbl[] =
> -{
> +static const struct baco_cmd_entry turn_off_plls_tbl[] = {
> { CMD_WRITE, mmGCK_SMC_IND_INDEX, 0, 0, 0, ixCG_SPLL_FUNC_CNTL },
> { CMD_READMODIFYWRITE, mmGCK_SMC_IND_DATA, CG_SPLL_FUNC_CNTL__SPLL_RESET_MASK, CG_SPLL_FUNC_CNTL__SPLL_RESET__SHIFT, 0, 0x1 },
> { CMD_READMODIFYWRITE, mmGCK_SMC_IND_DATA, CG_SPLL_FUNC_CNTL__SPLL_PWRON_MASK, CG_SPLL_FUNC_CNTL__SPLL_PWRON__SHIFT, 0, 0x0 },
> @@ -88,8 +84,7 @@ static const struct baco_cmd_entry turn_off_plls_tbl[] =
> { CMD_READMODIFYWRITE, mmGCK_SMC_IND_DATA, 0x8000000, 0x1b, 0, 0x0 }
> };
>
> -static const struct baco_cmd_entry clk_req_b_tbl[] =
> -{
> +static const struct baco_cmd_entry clk_req_b_tbl[] = {
> { CMD_WRITE, mmGCK_SMC_IND_INDEX, 0, 0, 0, ixCG_CLKPIN_CNTL_2 },
> { CMD_READMODIFYWRITE, mmGCK_SMC_IND_DATA, CG_CLKPIN_CNTL_2__FORCE_BIF_REFCLK_EN_MASK, CG_CLKPIN_CNTL_2__FORCE_BIF_REFCLK_EN__SHIFT, 0, 0x0 },
> { CMD_WRITE, mmGCK_SMC_IND_INDEX, 0, 0, 0, ixMPLL_BYPASSCLK_SEL },
> @@ -104,8 +99,7 @@ static const struct baco_cmd_entry clk_req_b_tbl[] =
> { CMD_READMODIFYWRITE, mmGCK_SMC_IND_DATA, THM_CLK_CNTL__TMON_CLK_SEL_MASK, THM_CLK_CNTL__TMON_CLK_SEL__SHIFT, 0, 0x1 }
> };
>
> -static const struct baco_cmd_entry enter_baco_tbl[] =
> -{
> +static const struct baco_cmd_entry enter_baco_tbl[] = {
> { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_EN_MASK, BACO_CNTL__BACO_EN__SHIFT, 0, 0x01 },
> { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_BIF_SCLK_SWITCH_MASK, BACO_CNTL__BACO_BIF_SCLK_SWITCH__SHIFT, 0, 0x01 },
> { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_BIF_SCLK_SWITCH_MASK, 0, 5, 0x40000 },
> @@ -122,8 +116,7 @@ static const struct baco_cmd_entry enter_baco_tbl[] =
>
> #define BACO_CNTL__PWRGOOD_MASK BACO_CNTL__PWRGOOD_GPIO_MASK+BACO_CNTL__PWRGOOD_MEM_MASK+BACO_CNTL__PWRGOOD_DVO_MASK
>
> -static const struct baco_cmd_entry exit_baco_tbl[] =
> -{
> +static const struct baco_cmd_entry exit_baco_tbl[] = {
> { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_RESET_EN_MASK, BACO_CNTL__BACO_RESET_EN__SHIFT, 0, 0x01 },
> { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_BCLK_OFF_MASK, BACO_CNTL__BACO_BCLK_OFF__SHIFT, 0, 0x00 },
> { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_POWER_OFF_MASK, BACO_CNTL__BACO_POWER_OFF__SHIFT, 0, 0x00 },
> @@ -138,8 +131,7 @@ static const struct baco_cmd_entry exit_baco_tbl[] =
> { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_MODE_MASK, 0, 0xffffffff, 0x00 }
> };
>
> -static const struct baco_cmd_entry clean_baco_tbl[] =
> -{
> +static const struct baco_cmd_entry clean_baco_tbl[] = {
> { CMD_WRITE, mmBIOS_SCRATCH_0, 0, 0, 0, 0 },
> { CMD_WRITE, mmBIOS_SCRATCH_1, 0, 0, 0, 0 },
> { CMD_WRITE, mmBIOS_SCRATCH_2, 0, 0, 0, 0 },
> --
> 2.17.1
>