Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859b8b6a authored by Nils Wallménius's avatar Nils Wallménius Committed by Alex Deucher
Browse files

drm/amd/powerplay: Use defined constants for minium engine clock 



Replacing magic numbers in calculation of sleep divider id for fiji
and polaris.

Signed-off-by: default avatarNils Wallménius <nils.wallmenius@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f9fbac64

drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c

+2 −1
Original line number Diff line number Diff line
@@ -1903,7 +1903,8 @@ static uint8_t fiji_get_sleep_divider_id_from_clock(struct pp_hwmgr *hwmgr, 
{

	uint8_t i;

	uint32_t temp;

	uint32_t min = clock_insr > 2500 ? clock_insr : 2500;

	uint32_t min = clock_insr > FIJI_MINIMUM_ENGINE_CLOCK ?

			clock_insr : FIJI_MINIMUM_ENGINE_CLOCK;



	PP_ASSERT_WITH_CODE((clock >= min), "Engine clock can't satisfy stutter requirement!", return 0);

	for (i = FIJI_MAX_DEEPSLEEP_DIVIDER_ID;  ; i--) {

drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -1175,11 +1175,11 @@ static int polaris10_populate_single_graphic_level(struct pp_hwmgr *hwmgr, 
	if (phm_cap_enabled(hwmgr->platformDescriptor.platformCaps, PHM_PlatformCaps_SclkDeepSleep))

		level->DeepSleepDivId = PhwFiji_GetSleepDividerIdFromClock(hwmgr, clock, minClocks.engineClockInSR);

	*/

	PP_ASSERT_WITH_CODE((clock >= 2500), "Engine clock can't satisfy stutter requirement!", return 0);

	PP_ASSERT_WITH_CODE((clock >= POLARIS10_MINIMUM_ENGINE_CLOCK), "Engine clock can't satisfy stutter requirement!", return 0);

	for (i = POLARIS10_MAX_DEEPSLEEP_DIVIDER_ID;  ; i--) {

		temp = clock / (1UL << i);



		if (temp >= 2500 || i == 0)

		if (temp >= POLARIS10_MINIMUM_ENGINE_CLOCK || i == 0)

			break;

	}