[PATCH 1/4] drm/amd/powerplay: Use defined constants for minium engine clock

[Alex Deucher]

On Thu, May 5, 2016 at 3:07 AM, Nils Wallménius
<nils.wallmenius at gmail.com> wrote:
> Replacing magic numbers in calculation of sleep divider id for fiji
> and polaris.
>
> Signed-off-by: Nils Wallménius <nils.wallmenius at gmail.com>

Applied.  Thanks,

Alex

> ---
>  drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c      | 3 ++-
>  drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 4 ++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c
> index d05a5e0..c574afd 100644
> --- 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 dbdcc68..c911ab8 100644
> --- 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;
>         }
>
> --
> 2.8.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel