Commit 39256835 authored by Mario Limonciello (AMD)'s avatar Mario Limonciello (AMD) Committed by Alex Deucher
Browse files

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 2a6c826c.

Fixes: 2a6c826c ("drm/amd: Skip power ungate during suspend for VPE")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMario Limonciello (AMD) <superm1@kernel.org>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reported-by: default avatarKonstantin <answer2019@yandex.ru>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220812


Reported-by: default avatarMatthew Schwartz <matthew.schwartz@linux.dev>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 81735604

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

+1 −2
Original line number Diff line number Diff line
@@ -3447,11 +3447,10 @@ int amdgpu_device_set_pg_state(struct amdgpu_device *adev, 
		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX ||

		     adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SDMA))

			continue;

		/* skip CG for VCE/UVD/VPE, it's handled specially */

		/* skip CG for VCE/UVD, it's handled specially */

		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&

		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE &&

		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCN &&

		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VPE &&

		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_JPEG &&

		    adev->ip_blocks[i].version->funcs->set_powergating_state) {

			/* enable powergating to save power */