Skip to content

Commit 31ab314

Browse files
superm1alexdeucher
authored andcommitted
drm/amd: Skip power ungate during suspend for VPE
During the suspend sequence VPE is already going to be power gated as part of vpe_suspend(). It's unnecessary to call during calls to amdgpu_device_set_pg_state(). It actually can expose a race condition with the firmware if s0i3 sequence starts as well. Drop these calls. Cc: Peyton.Lee@amd.com Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 2a6c826) Cc: stable@vger.kernel.org
1 parent 9eb00b5 commit 31ab314

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3414,10 +3414,11 @@ int amdgpu_device_set_pg_state(struct amdgpu_device *adev,
34143414
(adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX ||
34153415
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SDMA))
34163416
continue;
3417-
/* skip CG for VCE/UVD, it's handled specially */
3417+
/* skip CG for VCE/UVD/VPE, it's handled specially */
34183418
if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
34193419
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE &&
34203420
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCN &&
3421+
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VPE &&
34213422
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_JPEG &&
34223423
adev->ip_blocks[i].version->funcs->set_powergating_state) {
34233424
/* enable powergating to save power */

0 commit comments

Comments
 (0)