* [PATCH -next 2/5] drm/amd/display: clean up one inconsistent indenting
2023-09-01 1:29 [PATCH -next 1/5] drm/amd/display: clean up one inconsistent indenting Yang Li
@ 2023-09-01 1:29 ` Yang Li
2023-09-01 1:29 ` [PATCH -next 3/5] drm/amd/display: clean up some inconsistent indentings Yang Li
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Yang Li @ 2023-09-01 1:29 UTC (permalink / raw)
To: alexander.deucher, airlied, daniel, harry.wentland, Rodrigo.Siqueira
Cc: amd-gfx, dri-devel, linux-kernel, Yang Li
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn35/dcn35_resource.c:1877 dcn35_resource_construct() warn: inconsistent indenting
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c
index 7f059fc2fc75..bba747667a73 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c
@@ -1873,7 +1873,7 @@ static bool dcn35_resource_construct(
}
}
/*temp till dml2 fully work without dml1*/
- dml_init_instance(&dc->dml, &dcn3_5_soc, &dcn3_5_ip, DML_PROJECT_DCN31);
+ dml_init_instance(&dc->dml, &dcn3_5_soc, &dcn3_5_ip, DML_PROJECT_DCN31);
/* TODO: DCCG */
pool->base.dccg = dccg35_create(ctx, &dccg_regs, &dccg_shift, &dccg_mask);
--
2.20.1.7.g153144c
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH -next 3/5] drm/amd/display: clean up some inconsistent indentings
2023-09-01 1:29 [PATCH -next 1/5] drm/amd/display: clean up one inconsistent indenting Yang Li
2023-09-01 1:29 ` [PATCH -next 2/5] " Yang Li
@ 2023-09-01 1:29 ` Yang Li
2023-09-01 1:29 ` [PATCH -next 4/5] " Yang Li
2023-09-01 1:29 ` [PATCH -next 5/5] drm/amd/display: clean up one inconsistent indenting Yang Li
3 siblings, 0 replies; 6+ messages in thread
From: Yang Li @ 2023-09-01 1:29 UTC (permalink / raw)
To: alexander.deucher, airlied, daniel, harry.wentland, Rodrigo.Siqueira
Cc: amd-gfx, dri-devel, linux-kernel, Yang Li
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn35/dcn35_hwseq.c:159 dcn35_init_hw() warn: inconsistent indentig
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
.../drm/amd/display/dc/dcn35/dcn35_hwseq.c | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c
index 666e2809d9dc..025849143254 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c
@@ -155,22 +155,22 @@ void dcn35_init_hw(struct dc *dc)
res_pool->ref_clocks.xtalin_clock_inKhz =
dc->ctx->dc_bios->fw_info.pll_info.crystal_frequency;
- if (res_pool->dccg && res_pool->hubbub) {
-
- (res_pool->dccg->funcs->get_dccg_ref_freq)(res_pool->dccg,
- dc->ctx->dc_bios->fw_info.pll_info.crystal_frequency,
- &res_pool->ref_clocks.dccg_ref_clock_inKhz);
-
- (res_pool->hubbub->funcs->get_dchub_ref_freq)(res_pool->hubbub,
- res_pool->ref_clocks.dccg_ref_clock_inKhz,
- &res_pool->ref_clocks.dchub_ref_clock_inKhz);
- } else {
- // Not all ASICs have DCCG sw component
- res_pool->ref_clocks.dccg_ref_clock_inKhz =
- res_pool->ref_clocks.xtalin_clock_inKhz;
- res_pool->ref_clocks.dchub_ref_clock_inKhz =
- res_pool->ref_clocks.xtalin_clock_inKhz;
- }
+ if (res_pool->dccg && res_pool->hubbub) {
+
+ (res_pool->dccg->funcs->get_dccg_ref_freq)(res_pool->dccg,
+ dc->ctx->dc_bios->fw_info.pll_info.crystal_frequency,
+ &res_pool->ref_clocks.dccg_ref_clock_inKhz);
+
+ (res_pool->hubbub->funcs->get_dchub_ref_freq)(res_pool->hubbub,
+ res_pool->ref_clocks.dccg_ref_clock_inKhz,
+ &res_pool->ref_clocks.dchub_ref_clock_inKhz);
+ } else {
+ // Not all ASICs have DCCG sw component
+ res_pool->ref_clocks.dccg_ref_clock_inKhz =
+ res_pool->ref_clocks.xtalin_clock_inKhz;
+ res_pool->ref_clocks.dchub_ref_clock_inKhz =
+ res_pool->ref_clocks.xtalin_clock_inKhz;
+ }
} else
ASSERT_CRITICAL(false);
--
2.20.1.7.g153144c
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH -next 4/5] drm/amd/display: clean up some inconsistent indentings
2023-09-01 1:29 [PATCH -next 1/5] drm/amd/display: clean up one inconsistent indenting Yang Li
2023-09-01 1:29 ` [PATCH -next 2/5] " Yang Li
2023-09-01 1:29 ` [PATCH -next 3/5] drm/amd/display: clean up some inconsistent indentings Yang Li
@ 2023-09-01 1:29 ` Yang Li
2023-09-01 1:29 ` [PATCH -next 5/5] drm/amd/display: clean up one inconsistent indenting Yang Li
3 siblings, 0 replies; 6+ messages in thread
From: Yang Li @ 2023-09-01 1:29 UTC (permalink / raw)
To: alexander.deucher, airlied, daniel, harry.wentland, Rodrigo.Siqueira
Cc: amd-gfx, dri-devel, linux-kernel, Yang Li
drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c:288 dcn35_update_clocks() warn: inconsistent indenting
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
.../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c
index 9314e75195cd..98d6a1f8af60 100644
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c
@@ -288,8 +288,8 @@ void dcn35_update_clocks(struct clk_mgr *clk_mgr_base,
}
// workaround: Limit dppclk to 100Mhz to avoid lower eDP panel switch to plus 4K monitor underflow.
- if (new_clocks->dppclk_khz < 100000)
- new_clocks->dppclk_khz = 100000;
+ if (new_clocks->dppclk_khz < 100000)
+ new_clocks->dppclk_khz = 100000;
if (should_set_clock(safe_to_lower, new_clocks->dppclk_khz, clk_mgr->base.clks.dppclk_khz)) {
if (clk_mgr->base.clks.dppclk_khz > new_clocks->dppclk_khz)
@@ -901,21 +901,21 @@ void dcn35_clk_mgr_construct(
ASSERT(smu_dpm_clks.dpm_clks);
- clk_mgr->base.smu_ver = dcn35_smu_get_smu_version(&clk_mgr->base);
+ clk_mgr->base.smu_ver = dcn35_smu_get_smu_version(&clk_mgr->base);
- if (clk_mgr->base.smu_ver)
- clk_mgr->base.smu_present = true;
+ if (clk_mgr->base.smu_ver)
+ clk_mgr->base.smu_present = true;
- /* TODO: Check we get what we expect during bringup */
- clk_mgr->base.base.dentist_vco_freq_khz = get_vco_frequency_from_reg(&clk_mgr->base);
+ /* TODO: Check we get what we expect during bringup */
+ clk_mgr->base.base.dentist_vco_freq_khz = get_vco_frequency_from_reg(&clk_mgr->base);
- if (ctx->dc_bios->integrated_info->memory_type == LpDdr5MemType) {
- dcn35_bw_params.wm_table = lpddr5_wm_table;
- } else {
- dcn35_bw_params.wm_table = ddr5_wm_table;
- }
- /* Saved clocks configured at boot for debug purposes */
- dcn35_dump_clk_registers(&clk_mgr->base.base.boot_snapshot, &clk_mgr->base.base, &log_info);
+ if (ctx->dc_bios->integrated_info->memory_type == LpDdr5MemType) {
+ dcn35_bw_params.wm_table = lpddr5_wm_table;
+ } else {
+ dcn35_bw_params.wm_table = ddr5_wm_table;
+ }
+ /* Saved clocks configured at boot for debug purposes */
+ dcn35_dump_clk_registers(&clk_mgr->base.base.boot_snapshot, &clk_mgr->base.base, &log_info);
clk_mgr->base.base.dprefclk_khz = dcn35_smu_get_dprefclk(&clk_mgr->base);
clk_mgr->base.base.clks.ref_dtbclk_khz = dcn35_smu_get_dtbclk(&clk_mgr->base);
--
2.20.1.7.g153144c
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH -next 5/5] drm/amd/display: clean up one inconsistent indenting
2023-09-01 1:29 [PATCH -next 1/5] drm/amd/display: clean up one inconsistent indenting Yang Li
` (2 preceding siblings ...)
2023-09-01 1:29 ` [PATCH -next 4/5] " Yang Li
@ 2023-09-01 1:29 ` Yang Li
2023-09-05 17:38 ` Alex Deucher
3 siblings, 1 reply; 6+ messages in thread
From: Yang Li @ 2023-09-01 1:29 UTC (permalink / raw)
To: alexander.deucher, airlied, daniel, harry.wentland, Rodrigo.Siqueira
Cc: amd-gfx, dri-devel, linux-kernel, Yang Li
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn35/dcn35_fpu.c:260 dcn35_update_bw_bounding_box_fpu() warn: inconsistent indenting
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
index 525ca0ed9ea9..46eb2d0592f3 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
@@ -348,8 +348,8 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc,
dc->debug.dram_clock_change_latency_ns / 1000.0;
}
/*temp till dml2 fully work without dml1*/
- dml_init_instance(&dc->dml, &dcn3_5_soc, &dcn3_5_ip,
- DML_PROJECT_DCN31);
+ dml_init_instance(&dc->dml, &dcn3_5_soc, &dcn3_5_ip,
+ DML_PROJECT_DCN31);
}
static bool is_dual_plane(enum surface_pixel_format format)
--
2.20.1.7.g153144c
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH -next 5/5] drm/amd/display: clean up one inconsistent indenting
2023-09-01 1:29 ` [PATCH -next 5/5] drm/amd/display: clean up one inconsistent indenting Yang Li
@ 2023-09-05 17:38 ` Alex Deucher
0 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2023-09-05 17:38 UTC (permalink / raw)
To: Yang Li
Cc: alexander.deucher, airlied, daniel, harry.wentland,
Rodrigo.Siqueira, dri-devel, amd-gfx, linux-kernel
Applied the series. Thanks!
Alex
On Thu, Aug 31, 2023 at 9:29 PM Yang Li <yang.lee@linux.alibaba.com> wrote:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn35/dcn35_fpu.c:260 dcn35_update_bw_bounding_box_fpu() warn: inconsistent indenting
>
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---
> drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
> index 525ca0ed9ea9..46eb2d0592f3 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
> @@ -348,8 +348,8 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc,
> dc->debug.dram_clock_change_latency_ns / 1000.0;
> }
> /*temp till dml2 fully work without dml1*/
> - dml_init_instance(&dc->dml, &dcn3_5_soc, &dcn3_5_ip,
> - DML_PROJECT_DCN31);
> + dml_init_instance(&dc->dml, &dcn3_5_soc, &dcn3_5_ip,
> + DML_PROJECT_DCN31);
> }
>
> static bool is_dual_plane(enum surface_pixel_format format)
> --
> 2.20.1.7.g153144c
>
^ permalink raw reply [flat|nested] 6+ messages in thread