Commit ad4e140e authored by Joshua Aberback's avatar Joshua Aberback Committed by Alex Deucher
Browse files

drm/amd/display: Adjust DML workaround threshold 



[Why]
There is a case where the margin is between 50 and 60, but applying the
workaround causes a hang. By increasing the threshold, we are blocking more
cases from switching p-state during active, but those cases will fall back
to switching during blank, which is fine.

[How]
 - increase required margin from 50 to 60

Signed-off-by: default avatarJoshua Aberback <joshua.aberback@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2057b7e1

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

+1 −1
Original line number Diff line number Diff line
@@ -2578,7 +2578,7 @@ static void dml20_DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPer 
					+ mode_lib->vba.DRAMClockChangeLatency;



	if (mode_lib->vba.DRAMClockChangeSupportsVActive &&

			mode_lib->vba.MinActiveDRAMClockChangeMargin > 50) {

			mode_lib->vba.MinActiveDRAMClockChangeMargin > 60) {

		mode_lib->vba.DRAMClockChangeWatermark += 25;

		mode_lib->vba.DRAMClockChangeSupport[0][0] = dm_dram_clock_change_vactive;

	} else {

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

+1 −1
Original line number Diff line number Diff line
@@ -2612,7 +2612,7 @@ static void dml20v2_DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndP 
					+ mode_lib->vba.DRAMClockChangeLatency;



	if (mode_lib->vba.DRAMClockChangeSupportsVActive &&

		mode_lib->vba.MinActiveDRAMClockChangeMargin > 50) {

			mode_lib->vba.MinActiveDRAMClockChangeMargin > 60) {

		mode_lib->vba.DRAMClockChangeWatermark += 25;

		mode_lib->vba.DRAMClockChangeSupport[0][0] = dm_dram_clock_change_vactive;

	} else if (mode_lib->vba.DummyPStateCheck &&