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: Nils Wallménius <nils.wallmenius@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
index d05a5e0ab87f1d70653cce8f8af308d60fa1e06c..c574afd5e12b14be833a0c98bda89db554a7a423 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
@@ -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--) {

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
index dbdcc68b17b2e7f3bb10b9cda44353b1fcee116a..c911ab881d6aff62746fbb4a364017bc6d888a37 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
@@ -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;
        }