| Message ID | 20220623153001.3136739-1-nathan@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: Fix indentation in dcn32_get_vco_frequency_from_reg() | expand |
On 2022-06-23 11:30, Nathan Chancellor wrote: > Clang warns: > > drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c:549:4: warning: misleading indentation; statement is not part of the previous 'else' [-Wmisleading-indentation] > pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); > ^ > drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c:542:3: note: previous statement is here > else > ^ > 1 warning generated. > > Indent this statement to the left, as it was clearly intended to be > called unconditionally, which will fix the warning. > > Link: https://github.com/ClangBuiltLinux/linux/issues/1655 > Fixes: 3e838f7ccf64 ("drm/amd/display: Get VCO frequency from registers") > Signed-off-by: Nathan Chancellor <nathan@kernel.org> Just hit this myself, thanks for the fix! Reviewed-by: Leo Li <sunpeng.li@amd.com> > --- > drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c > index 113f93b3d3b2..4e8059f20007 100644 > --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c > +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c > @@ -546,7 +546,7 @@ static uint32_t dcn32_get_vco_frequency_from_reg(struct clk_mgr_internal *clk_mg > * this works because the int part is on the right edge of the register > * and the frac part is on the left edge > */ > - pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); > + pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); > pll_req.value |= pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_frac; > > /* multiply by REFCLK period */ > > base-commit: fdf249c70a36e2daa7ddf1252cf3b71faed87abc
Applied. Thanks! Alex On Thu, Jun 23, 2022 at 12:26 PM Leo <sunpeng.li@amd.com> wrote: > > > > On 2022-06-23 11:30, Nathan Chancellor wrote: > > Clang warns: > > > > drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c:549:4: warning: misleading indentation; statement is not part of the previous 'else' [-Wmisleading-indentation] > > pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); > > ^ > > drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c:542:3: note: previous statement is here > > else > > ^ > > 1 warning generated. > > > > Indent this statement to the left, as it was clearly intended to be > > called unconditionally, which will fix the warning. > > > > Link: https://github.com/ClangBuiltLinux/linux/issues/1655 > > Fixes: 3e838f7ccf64 ("drm/amd/display: Get VCO frequency from registers") > > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > > Just hit this myself, thanks for the fix! > Reviewed-by: Leo Li <sunpeng.li@amd.com> > > > --- > > drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c > > index 113f93b3d3b2..4e8059f20007 100644 > > --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c > > +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c > > @@ -546,7 +546,7 @@ static uint32_t dcn32_get_vco_frequency_from_reg(struct clk_mgr_internal *clk_mg > > * this works because the int part is on the right edge of the register > > * and the frac part is on the left edge > > */ > > - pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); > > + pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); > > pll_req.value |= pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_frac; > > > > /* multiply by REFCLK period */ > > > > base-commit: fdf249c70a36e2daa7ddf1252cf3b71faed87abc >
diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c index 113f93b3d3b2..4e8059f20007 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c @@ -546,7 +546,7 @@ static uint32_t dcn32_get_vco_frequency_from_reg(struct clk_mgr_internal *clk_mg * this works because the int part is on the right edge of the register * and the frac part is on the left edge */ - pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); + pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); pll_req.value |= pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_frac; /* multiply by REFCLK period */
Clang warns: drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c:549:4: warning: misleading indentation; statement is not part of the previous 'else' [-Wmisleading-indentation] pll_req = dc_fixpt_from_int(pll_req_reg & clk_mgr->clk_mgr_mask->FbMult_int); ^ drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c:542:3: note: previous statement is here else ^ 1 warning generated. Indent this statement to the left, as it was clearly intended to be called unconditionally, which will fix the warning. Link: https://github.com/ClangBuiltLinux/linux/issues/1655 Fixes: 3e838f7ccf64 ("drm/amd/display: Get VCO frequency from registers") Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: fdf249c70a36e2daa7ddf1252cf3b71faed87abc