Skip to content

Commit 1191c0f

Browse files
Alvin Leegregkh
authored andcommitted
drm/amd/display: Use DRAM speed from validation for dummy p-state
commit 9be6011 upstream. [Description] When choosing which dummy p-state latency to use, we need to use the DRAM speed from validation. The DRAMSpeed DML variable can change because we use different input params to DML when populating watermarks set B. Cc: stable@vger.kernel.org # 6.1+ Reviewed-by: Samson Tam <samson.tam@amd.com> Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com> Signed-off-by: Alvin Lee <alvin.lee2@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7fa19a7 commit 1191c0f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1964,6 +1964,7 @@ void dcn32_calculate_wm_and_dlg_fpu(struct dc *dc, struct dc_state *context,
19641964
int i, pipe_idx, vlevel_temp = 0;
19651965
double dcfclk = dcn3_2_soc.clock_limits[0].dcfclk_mhz;
19661966
double dcfclk_from_validation = context->bw_ctx.dml.vba.DCFCLKState[vlevel][context->bw_ctx.dml.vba.maxMpcComb];
1967+
double dram_speed_from_validation = context->bw_ctx.dml.vba.DRAMSpeed;
19671968
double dcfclk_from_fw_based_mclk_switching = dcfclk_from_validation;
19681969
bool pstate_en = context->bw_ctx.dml.vba.DRAMClockChangeSupport[vlevel][context->bw_ctx.dml.vba.maxMpcComb] !=
19691970
dm_dram_clock_change_unsupported;
@@ -2151,7 +2152,7 @@ void dcn32_calculate_wm_and_dlg_fpu(struct dc *dc, struct dc_state *context,
21512152
}
21522153

21532154
if (dc->clk_mgr->bw_params->wm_table.nv_entries[WM_C].valid) {
2154-
min_dram_speed_mts = context->bw_ctx.dml.vba.DRAMSpeed;
2155+
min_dram_speed_mts = dram_speed_from_validation;
21552156
min_dram_speed_mts_margin = 160;
21562157

21572158
context->bw_ctx.dml.soc.dram_clock_change_latency_us =

0 commit comments

Comments
 (0)