Skip to content

Commit 25f1488

Browse files
BNieuwenhuizenalexdeucher
authored andcommitted
drm/amd/display: Wrap dcn301_calculate_wm_and_dlg for FPU.
Mirrors the logic for dcn30. Cue lots of WARNs and some kernel panics without this fix. Cc: [email protected] Signed-off-by: Bas Nieuwenhuizen <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 72a8d87 commit 25f1488

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,6 +1380,17 @@ static void set_wm_ranges(
13801380
pp_smu->nv_funcs.set_wm_ranges(&pp_smu->nv_funcs.pp_smu, &ranges);
13811381
}
13821382

1383+
static void dcn301_calculate_wm_and_dlg(
1384+
struct dc *dc, struct dc_state *context,
1385+
display_e2e_pipe_params_st *pipes,
1386+
int pipe_cnt,
1387+
int vlevel)
1388+
{
1389+
DC_FP_START();
1390+
dcn301_calculate_wm_and_dlg_fp(dc, context, pipes, pipe_cnt, vlevel);
1391+
DC_FP_END();
1392+
}
1393+
13831394
static struct resource_funcs dcn301_res_pool_funcs = {
13841395
.destroy = dcn301_destroy_resource_pool,
13851396
.link_enc_create = dcn301_link_encoder_create,

drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ void dcn301_fpu_init_soc_bounding_box(struct bp_soc_bb_info bb_info)
327327
dcn3_01_soc.sr_exit_time_us = bb_info.dram_sr_exit_latency_100ns * 10;
328328
}
329329

330-
void dcn301_calculate_wm_and_dlg(struct dc *dc,
330+
void dcn301_calculate_wm_and_dlg_fp(struct dc *dc,
331331
struct dc_state *context,
332332
display_e2e_pipe_params_st *pipes,
333333
int pipe_cnt,

drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void dcn301_fpu_set_wm_ranges(int i,
3434

3535
void dcn301_fpu_init_soc_bounding_box(struct bp_soc_bb_info bb_info);
3636

37-
void dcn301_calculate_wm_and_dlg(struct dc *dc,
37+
void dcn301_calculate_wm_and_dlg_fp(struct dc *dc,
3838
struct dc_state *context,
3939
display_e2e_pipe_params_st *pipes,
4040
int pipe_cnt,

0 commit comments

Comments
 (0)