Commit 4f3a2c10 authored by Prike Liang's avatar Prike Liang Committed by Alex Deucher
Browse files

drm/amd/amdgpu: power up sdma engine when S3 resume back 



The sdma_v4 should be ungated when the IP resume back,
otherwise it will hang up and resume time out error.

Signed-off-by: default avatarPrike Liang <Prike.Liang@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 73d8e6c7

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

+1 −1
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t block 
	case AMD_IP_BLOCK_TYPE_UVD:

	case AMD_IP_BLOCK_TYPE_VCN:

	case AMD_IP_BLOCK_TYPE_VCE:

	case AMD_IP_BLOCK_TYPE_SDMA:

		if (swsmu)

			ret = smu_dpm_set_power_gate(&adev->smu, block_type, gate);

		else
@@ -956,7 +957,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t block 
		break;

	case AMD_IP_BLOCK_TYPE_GMC:

	case AMD_IP_BLOCK_TYPE_ACP:

	case AMD_IP_BLOCK_TYPE_SDMA:

		ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu(

				(adev)->powerplay.pp_handle, block_type, gate));

		break;

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

+6 −4
Original line number Diff line number Diff line
@@ -1889,8 +1889,9 @@ static int sdma_v4_0_hw_init(void *handle) 
	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (adev->asic_type == CHIP_RAVEN && adev->powerplay.pp_funcs &&

			adev->powerplay.pp_funcs->set_powergating_by_smu)

	if ((adev->asic_type == CHIP_RAVEN && adev->powerplay.pp_funcs &&

			adev->powerplay.pp_funcs->set_powergating_by_smu) ||

			adev->asic_type == CHIP_RENOIR)

		amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_SDMA, false);



	if (!amdgpu_sriov_vf(adev))
@@ -1917,8 +1918,9 @@ static int sdma_v4_0_hw_fini(void *handle) 
	sdma_v4_0_ctx_switch_enable(adev, false);

	sdma_v4_0_enable(adev, false);



	if (adev->asic_type == CHIP_RAVEN && adev->powerplay.pp_funcs

			&& adev->powerplay.pp_funcs->set_powergating_by_smu)

	if ((adev->asic_type == CHIP_RAVEN && adev->powerplay.pp_funcs

			&& adev->powerplay.pp_funcs->set_powergating_by_smu) ||

			adev->asic_type == CHIP_RENOIR)

		amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_SDMA, true);



	return 0;

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

+3 −0
Original line number Diff line number Diff line
@@ -354,6 +354,9 @@ int smu_dpm_set_power_gate(struct smu_context *smu, uint32_t block_type, 
	case AMD_IP_BLOCK_TYPE_GFX:

		ret = smu_gfx_off_control(smu, gate);

		break;

	case AMD_IP_BLOCK_TYPE_SDMA:

		ret = smu_powergate_sdma(smu, gate);

		break;

	default:

		break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE