aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index b8ed8faf2003..6634545060fd 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -592,11 +592,7 @@ static int uvd_v7_0_suspend(void *handle)
592 if (r) 592 if (r)
593 return r; 593 return r;
594 594
595 /* Skip this for APU for now */ 595 return amdgpu_uvd_suspend(adev);
596 if (!(adev->flags & AMD_IS_APU))
597 r = amdgpu_uvd_suspend(adev);
598
599 return r;
600} 596}
601 597
602static int uvd_v7_0_resume(void *handle) 598static int uvd_v7_0_resume(void *handle)
@@ -604,12 +600,10 @@ static int uvd_v7_0_resume(void *handle)
604 int r; 600 int r;
605 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 601 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
606 602
607 /* Skip this for APU for now */ 603 r = amdgpu_uvd_resume(adev);
608 if (!(adev->flags & AMD_IS_APU)) { 604 if (r)
609 r = amdgpu_uvd_resume(adev); 605 return r;
610 if (r) 606
611 return r;
612 }
613 return uvd_v7_0_hw_init(adev); 607 return uvd_v7_0_hw_init(adev);
614} 608}
615 609