[PATCH] drm/amdgpu: fix commit 4ef9d7d

[Alex Deucher]

On Tue, Aug 27, 2019 at 11:34 AM Aaron Liu <aaron.liu at amd.com> wrote:
>
> For picasso(adev->pdev->device == 0x15d8)&raven2(adev->rev_id >= 0x8),
> firmware is sufficient to support gfxoff.
> In commit 4ef9d7dc2db166cbe83fe4621385f034c9347fd2, for picasso&raven2,
> return directly and cause gfxoff disabled.
>
> Signed-off-by: Aaron Liu <aaron.liu at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 2762ae4..fd7947e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -1027,14 +1027,14 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev)
>         case CHIP_VEGA20:
>                 break;
>         case CHIP_RAVEN:
> -               if (adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)
> -                       break;
> -               if ((adev->gfx.rlc_fw_version != 106 &&
> -                    adev->gfx.rlc_fw_version < 531) ||
> -                   (adev->gfx.rlc_fw_version == 53815) ||
> -                   (adev->gfx.rlc_feature_version < 1) ||
> -                   !adev->gfx.rlc.is_rlc_v2_1)
> +               if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)
> +                       &&((adev->gfx.rlc_fw_version != 106 &&
> +                            adev->gfx.rlc_fw_version < 531) ||
> +                           (adev->gfx.rlc_fw_version == 53815) ||
> +                           (adev->gfx.rlc_feature_version < 1) ||
> +                           !adev->gfx.rlc.is_rlc_v2_1))
>                         adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
> +
>                 if (adev->pm.pp_feature & PP_GFXOFF_MASK)
>                         adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
>                                 AMD_PG_SUPPORT_CP |
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx