* [PATCH] Revert "drm/amd: Skip power ungate during suspend for VPE"
@ 2025-11-30 1:46 Mario Limonciello (AMD)
2025-12-01 4:48 ` Mario Limonciello (AMD) (kernel.org)
0 siblings, 1 reply; 3+ messages in thread
From: Mario Limonciello (AMD) @ 2025-11-30 1:46 UTC (permalink / raw)
To: amd-gfx; +Cc: Mario Limonciello (AMD), stable
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 31ab31433c9bd2f255c48dc6cb9a99845c58b1e4.
Fixes: 31ab31433c9bd ("drm/amd: Skip power ungate during suspend for VPE")
Cc: stable@vger.kernel.org
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 076bbc09f30ce..2819aceaab749 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3414,11 +3414,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 */
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "drm/amd: Skip power ungate during suspend for VPE"
2025-11-30 1:46 [PATCH] Revert "drm/amd: Skip power ungate during suspend for VPE" Mario Limonciello (AMD)
@ 2025-12-01 4:48 ` Mario Limonciello (AMD) (kernel.org)
2025-12-01 19:17 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Mario Limonciello (AMD) (kernel.org) @ 2025-12-01 4:48 UTC (permalink / raw)
To: amd-gfx; +Cc: stable
On 11/29/2025 7:46 PM, Mario Limonciello (AMD) wrote:
> 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 31ab31433c9bd2f255c48dc6cb9a99845c58b1e4.
>
> Fixes: 31ab31433c9bd ("drm/amd: Skip power ungate during suspend for VPE")
> Cc: stable@vger.kernel.org
> Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
This was reported by a few people tangentially to me reproducing it
myself and coming up with the revert.
Here's some more tags to include with the revert.
Reported-by: Konstantin <answer2019@yandex.ru>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220812
Reported-by: Matthew Schwartz <matthew.schwartz@linux.dev>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 076bbc09f30ce..2819aceaab749 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -3414,11 +3414,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 */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "drm/amd: Skip power ungate during suspend for VPE"
2025-12-01 4:48 ` Mario Limonciello (AMD) (kernel.org)
@ 2025-12-01 19:17 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2025-12-01 19:17 UTC (permalink / raw)
To: Mario Limonciello (AMD) (kernel.org); +Cc: amd-gfx, stable
On Mon, Dec 1, 2025 at 12:04 AM Mario Limonciello (AMD) (kernel.org)
<superm1@kernel.org> wrote:
>
>
>
> On 11/29/2025 7:46 PM, Mario Limonciello (AMD) wrote:
> > 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 31ab31433c9bd2f255c48dc6cb9a99845c58b1e4.
> >
> > Fixes: 31ab31433c9bd ("drm/amd: Skip power ungate during suspend for VPE")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
>
> This was reported by a few people tangentially to me reproducing it
> myself and coming up with the revert.
>
> Here's some more tags to include with the revert.
>
> Reported-by: Konstantin <answer2019@yandex.ru>
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220812
> Reported-by: Matthew Schwartz <matthew.schwartz@linux.dev>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > index 076bbc09f30ce..2819aceaab749 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > @@ -3414,11 +3414,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 */
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-12-01 19:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-30 1:46 [PATCH] Revert "drm/amd: Skip power ungate during suspend for VPE" Mario Limonciello (AMD)
2025-12-01 4:48 ` Mario Limonciello (AMD) (kernel.org)
2025-12-01 19:17 ` Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.