Skip to content

Commit f1c5e6a

Browse files
changzhugregkh
authored andcommitted
drm/amdgpu: enable gfxoff for raven1 refresh
[ Upstream commit e0c6381 ] 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: Sasha Levin <sashal@kernel.org>
1 parent 93ed80d commit f1c5e6a

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,17 +1038,10 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev)
10381038
case CHIP_VEGA20:
10391039
break;
10401040
case CHIP_RAVEN:
1041-
/* Disable GFXOFF on original raven. There are combinations
1042-
* of sbios and platforms that are not stable.
1043-
*/
1044-
if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8))
1045-
adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
1046-
else if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)
1047-
&&((adev->gfx.rlc_fw_version != 106 &&
1048-
adev->gfx.rlc_fw_version < 531) ||
1049-
(adev->gfx.rlc_fw_version == 53815) ||
1050-
(adev->gfx.rlc_feature_version < 1) ||
1051-
!adev->gfx.rlc.is_rlc_v2_1))
1041+
if (!(adev->rev_id >= 0x8 ||
1042+
adev->pdev->device == 0x15d8) &&
1043+
(adev->pm.fw_version < 0x41e2b || /* not raven1 fresh */
1044+
!adev->gfx.rlc.is_rlc_v2_1)) /* without rlc save restore ucodes */
10521045
adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
10531046

10541047
if (adev->pm.pp_feature & PP_GFXOFF_MASK)

0 commit comments

Comments
 (0)