drm/amd/display: Remove duplicate dml init

Aurabindo Pillai · alexdeucher · commit b6d585041fd0 · 2021-08-26T13:57:22.000-04:00
[Why & How] DML is initialized again unnecessarily after its done conditionally. Remove the duplicate initialization Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1403 Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
@@ -2511,11 +2511,6 @@ void dcn30_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params
 		if (dc->current_state)
 			dml_init_instance(&dc->current_state->bw_ctx.dml, &dcn3_0_soc, &dcn3_0_ip, DML_PROJECT_DCN30);
 	}
-
-	/* re-init DML with updated bb */
-	dml_init_instance(&dc->dml, &dcn3_0_soc, &dcn3_0_ip, DML_PROJECT_DCN30);
-	if (dc->current_state)
-		dml_init_instance(&dc->current_state->bw_ctx.dml, &dcn3_0_soc, &dcn3_0_ip, DML_PROJECT_DCN30);
 }
 
 static const struct resource_funcs dcn30_res_pool_funcs = {

Original file line number	Diff line number	Diff line change
`@@ -2511,11 +2511,6 @@ void dcn30_update_bw_bounding_box(struct dc dc, struct clk_bw_params bw_params`
`2511`	`2511`	`if (dc->current_state)`
`2512`	`2512`	`dml_init_instance(&dc->current_state->bw_ctx.dml, &dcn3_0_soc, &dcn3_0_ip, DML_PROJECT_DCN30);`
`2513`	`2513`	`}`
`2514`		`-`
`2515`		`- /* re-init DML with updated bb */`
`2516`		`- dml_init_instance(&dc->dml, &dcn3_0_soc, &dcn3_0_ip, DML_PROJECT_DCN30);`
`2517`		`- if (dc->current_state)`
`2518`		`- dml_init_instance(&dc->current_state->bw_ctx.dml, &dcn3_0_soc, &dcn3_0_ip, DML_PROJECT_DCN30);`
`2519`	`2514`	`}`
`2520`	`2515`
`2521`	`2516`	`static const struct resource_funcs dcn30_res_pool_funcs = {`