diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-10-26 05:30:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-26 05:30:39 +1000 |
| commit | 5a28747b4a74aebadde81044241a704c0c40893a (patch) | |
| tree | e595351774b0ba4f5ac510da4cacc9666332f8f5 /drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | |
| parent | Linux 4.14-rc6 (diff) | |
| parent | drm/amd/amdgpu: Remove workaround check for UVD6 on APUs (diff) | |
| download | wireguard-linux-5a28747b4a74aebadde81044241a704c0c40893a.tar.xz wireguard-linux-5a28747b4a74aebadde81044241a704c0c40893a.zip | |
Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
two suspend/resume regression fixes.
* 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux:
drm/amd/amdgpu: Remove workaround check for UVD6 on APUs
drm/amd/powerplay: fix uninitialized variable
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c index 31db356476f8..430a6b4dfac9 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c @@ -225,11 +225,7 @@ static int uvd_v6_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_v6_0_resume(void *handle) @@ -237,12 +233,10 @@ static int uvd_v6_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_v6_0_hw_init(adev); } |