| From f475efd7c78cd3de85f1cc24be29f2bad4931d38 Mon Sep 17 00:00:00 2001 |
| From: changzhu <Changfeng.Zhu@amd.com> |
| Date: Thu, 12 Dec 2019 13:46:06 +0800 |
| Subject: [PATCH] drm/amdgpu: enable gfxoff for raven1 refresh |
| |
| commit e0c63812352298efbce2a71483c1dab627d0c288 upstream. |
| |
| When smu version is larger than 0x41e2b, it will load |
| raven_kicker_rlc.bin.To enable gfxoff for raven_kicker_rlc.bin,it |
| needs to avoid adev->pm.pp_feature &= ~PP_GFXOFF_MASK when it loads |
| raven_kicker_rlc.bin. |
| |
| Signed-off-by: changzhu <Changfeng.Zhu@amd.com> |
| Reviewed-by: Huang Rui <ray.huang@amd.com> |
| Acked-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c |
| index 8ccaf26cc29a..ca42225b27c0 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c |
| @@ -595,17 +595,10 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev) |
| case CHIP_VEGA20: |
| break; |
| case CHIP_RAVEN: |
| - /* Disable GFXOFF on original raven. There are combinations |
| - * of sbios and platforms that are not stable. |
| - */ |
| - if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)) |
| - adev->pm.pp_feature &= ~PP_GFXOFF_MASK; |
| - else 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)) |
| + if (!(adev->rev_id >= 0x8 || |
| + adev->pdev->device == 0x15d8) && |
| + (adev->pm.fw_version < 0x41e2b || /* not raven1 fresh */ |
| + !adev->gfx.rlc.is_rlc_v2_1)) /* without rlc save restore ucodes */ |
| adev->pm.pp_feature &= ~PP_GFXOFF_MASK; |
| |
| if (adev->pm.pp_feature & PP_GFXOFF_MASK) |
| -- |
| 2.7.4 |
| |
