Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1c5e6ab authored by changzhu's avatar changzhu Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: enable gfxoff for raven1 refresh 



[ Upstream commit e0c63812352298efbce2a71483c1dab627d0c288 ]

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: default avatarchangzhu <Changfeng.Zhu@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 93ed80d6

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

+4 −11
Original line number Diff line number Diff line
@@ -1038,17 +1038,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)