Skip to content

Commit 3925683

Browse files
superm1alexdeucher
authored andcommitted
Revert "drm/amd: Skip power ungate during suspend for VPE"
Skipping power ungate exposed some scenarios that will fail like below: ``` amdgpu: Register(0) [regVPEC_QUEUE_RESET_REQ] failed to reach value 0x00000000 != 0x00000001n amdgpu 0000:c1:00.0: amdgpu: VPE queue reset failed ... amdgpu: [drm] *ERROR* wait_for_completion_timeout timeout! ``` The underlying s2idle issue that prompted this commit is going to be fixed in BIOS. This reverts commit 2a6c826. Fixes: 2a6c826 ("drm/amd: Skip power ungate during suspend for VPE") Cc: stable@vger.kernel.org Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reported-by: Konstantin <answer2019@yandex.ru> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220812 Reported-by: Matthew Schwartz <matthew.schwartz@linux.dev> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 8173560 commit 3925683

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3447,11 +3447,10 @@ int amdgpu_device_set_pg_state(struct amdgpu_device *adev,
34473447
(adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX ||
34483448
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SDMA))
34493449
continue;
3450-
/* skip CG for VCE/UVD/VPE, it's handled specially */
3450+
/* skip CG for VCE/UVD, it's handled specially */
34513451
if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
34523452
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE &&
34533453
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCN &&
3454-
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VPE &&
34553454
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_JPEG &&
34563455
adev->ip_blocks[i].version->funcs->set_powergating_state) {
34573456
/* enable powergating to save power */

0 commit comments

Comments
 (0)