Skip to content

Commit 2a80734

Browse files
BNieuwenhuizenalexdeucher
authored andcommitted
drm/amdgpu/display: Remove t_srx_delay_us.
Unused. Convert the divisions into asserts on the divisor, to debug why it is zero. The divide by zero is suspected of causing kernel panics. While I have no idea where the zero is coming from I think this patch is a positive either way. Cc: [email protected] Reviewed-by: Harry Wentland <[email protected]> Signed-off-by: Bas Nieuwenhuizen <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 25f1488 commit 2a80734

File tree

8 files changed

+0
-17
lines changed

8 files changed

+0
-17
lines changed

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ static void dcn_bw_calc_rq_dlg_ttu(
503503
//input[in_idx].dout.output_standard;
504504

505505
/*todo: soc->sr_enter_plus_exit_time??*/
506-
dlg_sys_param->t_srx_delay_us = dc->dcn_ip->dcfclk_cstate_latency / v->dcf_clk_deep_sleep;
507506

508507
dml1_rq_dlg_get_rq_params(dml, rq_param, &input->pipe.src);
509508
dml1_extract_rq_regs(dml, rq_regs, rq_param);

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,8 +1576,6 @@ void dml20_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
15761576
dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,
15771577
e2e_pipe_param,
15781578
num_pipes);
1579-
dlg_sys_param.t_srx_delay_us = mode_lib->ip.dcfclk_cstate_latency
1580-
/ dlg_sys_param.deepsleep_dcfclk_mhz; // TODO: Deprecated
15811579

15821580
print__dlg_sys_params_st(mode_lib, &dlg_sys_param);
15831581

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,8 +1577,6 @@ void dml20v2_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
15771577
dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,
15781578
e2e_pipe_param,
15791579
num_pipes);
1580-
dlg_sys_param.t_srx_delay_us = mode_lib->ip.dcfclk_cstate_latency
1581-
/ dlg_sys_param.deepsleep_dcfclk_mhz; // TODO: Deprecated
15821580

15831581
print__dlg_sys_params_st(mode_lib, &dlg_sys_param);
15841582

drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,8 +1688,6 @@ void dml21_rq_dlg_get_dlg_reg(
16881688
mode_lib,
16891689
e2e_pipe_param,
16901690
num_pipes);
1691-
dlg_sys_param.t_srx_delay_us = mode_lib->ip.dcfclk_cstate_latency
1692-
/ dlg_sys_param.deepsleep_dcfclk_mhz; // TODO: Deprecated
16931691

16941692
print__dlg_sys_params_st(mode_lib, &dlg_sys_param);
16951693

drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,6 @@ void dml30_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
18581858
dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib,
18591859
e2e_pipe_param,
18601860
num_pipes);
1861-
dlg_sys_param.t_srx_delay_us = mode_lib->ip.dcfclk_cstate_latency
1862-
/ dlg_sys_param.deepsleep_dcfclk_mhz; // TODO: Deprecated
18631861

18641862
print__dlg_sys_params_st(mode_lib, &dlg_sys_param);
18651863

drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,6 @@ struct _vcs_dpi_display_dlg_sys_params_st {
546546
double t_sr_wm_us;
547547
double t_extra_us;
548548
double mem_trip_us;
549-
double t_srx_delay_us;
550549
double deepsleep_dcfclk_mhz;
551550
double total_flip_bw;
552551
unsigned int total_flip_bytes;

drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ void print__dlg_sys_params_st(struct display_mode_lib *mode_lib, const struct _v
141141
dml_print("DML_RQ_DLG_CALC: t_urg_wm_us = %3.2f\n", dlg_sys_param->t_urg_wm_us);
142142
dml_print("DML_RQ_DLG_CALC: t_sr_wm_us = %3.2f\n", dlg_sys_param->t_sr_wm_us);
143143
dml_print("DML_RQ_DLG_CALC: t_extra_us = %3.2f\n", dlg_sys_param->t_extra_us);
144-
dml_print(
145-
"DML_RQ_DLG_CALC: t_srx_delay_us = %3.2f\n",
146-
dlg_sys_param->t_srx_delay_us);
147144
dml_print(
148145
"DML_RQ_DLG_CALC: deepsleep_dcfclk_mhz = %3.2f\n",
149146
dlg_sys_param->deepsleep_dcfclk_mhz);

drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,10 +1331,6 @@ void dml1_rq_dlg_get_dlg_params(
13311331
if (dual_plane)
13321332
DTRACE("DLG: %s: swath_height_c = %d", __func__, swath_height_c);
13331333

1334-
DTRACE(
1335-
"DLG: %s: t_srx_delay_us = %3.2f",
1336-
__func__,
1337-
(double) dlg_sys_param->t_srx_delay_us);
13381334
DTRACE("DLG: %s: line_time_in_us = %3.2f", __func__, (double) line_time_in_us);
13391335
DTRACE("DLG: %s: vupdate_offset = %d", __func__, vupdate_offset);
13401336
DTRACE("DLG: %s: vupdate_width = %d", __func__, vupdate_width);

0 commit comments

Comments
 (0)