drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7
The workaround is not required anymor and would result in hangs during suspend/resume cycles if the uvd block were busy.
--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +5 -11
@@ -592,11 +592,7 @@ static int uvd_v7_0_suspend(void *handle)if (r)return r; -/* Skip this for APU for now */ -if (!(adev->flags &AMD_IS_APU )) - r =amdgpu_uvd_suspend (adev); - -return r; +return amdgpu_uvd_suspend (adev); }static int uvd_v7_0_resume (void *handle)
@@ -604,12 +600,10 @@ static int uvd_v7_0_resume(void *handle)int r;struct amdgpu_device *adev = (struct amdgpu_device *)handle; -/* Skip this for APU for now */ -if (!(adev->flags &AMD_IS_APU )) { - r =amdgpu_uvd_resume (adev); -if (r) -return r; - } + r =amdgpu_uvd_resume (adev); +if (r) +return r; +return uvd_v7_0_hw_init (adev); }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Leo Liu
Acked-byQuoted 4 lines · Tom St Denis
The workaround is not required anymor and would result in hangs during suspend/resume cycles if the uvd block were busy.
Signed-off-by Tom St Denis <[email protected]>
Quoted 28 lines
--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +1
-8@@ -592,11 +592,7 @@ static int uvd_v7_0_suspend(void *handle)if (r)return r; -/* Skip this for APU for now */ -if (!(adev->flags &AMD_IS_APU )) - r =amdgpu_uvd_suspend (adev); - -return r; +return amdgpu_uvd_suspend (adev); }static int uvd_v7_0_resume (void *handle)@@ -604,12 +600,10 @@ static int uvd_v7_0_resume(void *handle)int r;struct amdgpu_device *adev = (struct amdgpu_device *)handle; -/* Skip this for APU for now */ -if (!(adev->flags &AMD_IS_APU )) { - r =amdgpu_uvd_resume (adev);
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c static int uvd_v7_0_resume(void *handle) · line 609
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +4
-3-if (r) -return r; - } + r =amdgpu_uvd_resume (adev); +if (r) +return r; +return uvd_v7_0_hw_init (adev); }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Acked-by Alex DeucherQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Tuesday, October 24, 2017 12:08 PM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7
Quoted 4 lines
The workaround is not required anymor and would result in hangs during suspend/resume cycles if the uvd block were busy.
Signed-off-by Tom St Denis <[email protected]>
Quoted 42 lines
--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +5
-12@@ -592,11 +592,7 @@ static int uvd_v7_0_suspend(void *handle)if (r)return r; -/* Skip this for APU for now */ -if (!(adev->flags &AMD_IS_APU )) - r =amdgpu_uvd_suspend (adev); - -return r; +return amdgpu_uvd_suspend (adev); }static int uvd_v7_0_resume (void *handle)@@ -604,12 +600,10 @@ static int uvd_v7_0_resume(void *handle)int r;struct amdgpu_device *adev = (struct amdgpu_device *)handle; -/* Skip this for APU for now */ -if (!(adev->flags &AMD_IS_APU )) { - r =amdgpu_uvd_resume (adev); -if (r) -return r; - } + r =amdgpu_uvd_resume (adev); +if (r) +return r; +return uvd_v7_0_hw_init (adev); } --2.12.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx