Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Bas Nieuwenhuizen and committed by
Alex Deucher
b6dca949 1790b649

-17
-1
drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c
··· 503 503 //input[in_idx].dout.output_standard; 504 504 505 505 /*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; 507 506 508 507 dml1_rq_dlg_get_rq_params(dml, rq_param, &input->pipe.src); 509 508 dml1_extract_rq_regs(dml, rq_regs, rq_param);
-2
drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c
··· 1576 1576 dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib, 1577 1577 e2e_pipe_param, 1578 1578 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 1581 1579 1582 1580 print__dlg_sys_params_st(mode_lib, &dlg_sys_param); 1583 1581
-2
drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
··· 1577 1577 dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib, 1578 1578 e2e_pipe_param, 1579 1579 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 1582 1580 1583 1581 print__dlg_sys_params_st(mode_lib, &dlg_sys_param); 1584 1582
-2
drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
··· 1688 1688 mode_lib, 1689 1689 e2e_pipe_param, 1690 1690 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 1693 1691 1694 1692 print__dlg_sys_params_st(mode_lib, &dlg_sys_param); 1695 1693
-2
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
··· 1858 1858 dlg_sys_param.total_flip_bytes = get_total_immediate_flip_bytes(mode_lib, 1859 1859 e2e_pipe_param, 1860 1860 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 1863 1861 1864 1862 print__dlg_sys_params_st(mode_lib, &dlg_sys_param); 1865 1863
-1
drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
··· 546 546 double t_sr_wm_us; 547 547 double t_extra_us; 548 548 double mem_trip_us; 549 - double t_srx_delay_us; 550 549 double deepsleep_dcfclk_mhz; 551 550 double total_flip_bw; 552 551 unsigned int total_flip_bytes;
-3
drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c
··· 142 142 dml_print("DML_RQ_DLG_CALC: t_sr_wm_us = %3.2f\n", dlg_sys_param->t_sr_wm_us); 143 143 dml_print("DML_RQ_DLG_CALC: t_extra_us = %3.2f\n", dlg_sys_param->t_extra_us); 144 144 dml_print( 145 - "DML_RQ_DLG_CALC: t_srx_delay_us = %3.2f\n", 146 - dlg_sys_param->t_srx_delay_us); 147 - dml_print( 148 145 "DML_RQ_DLG_CALC: deepsleep_dcfclk_mhz = %3.2f\n", 149 146 dlg_sys_param->deepsleep_dcfclk_mhz); 150 147 dml_print(
-4
drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
··· 1331 1331 if (dual_plane) 1332 1332 DTRACE("DLG: %s: swath_height_c = %d", __func__, swath_height_c); 1333 1333 1334 - DTRACE( 1335 - "DLG: %s: t_srx_delay_us = %3.2f", 1336 - __func__, 1337 - (double) dlg_sys_param->t_srx_delay_us); 1338 1334 DTRACE("DLG: %s: line_time_in_us = %3.2f", __func__, (double) line_time_in_us); 1339 1335 DTRACE("DLG: %s: vupdate_offset = %d", __func__, vupdate_offset); 1340 1336 DTRACE("DLG: %s: vupdate_width = %d", __func__, vupdate_width);