diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-16 22:07:36 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-16 22:07:36 +0100 |
| commit | 813ae37e6aed72cc457094b6066aa38efd66c9e9 (patch) | |
| tree | 8eb38e60d52feb2bb0cd022a434e80de53914719 /drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | |
| parent | 6314a17fec5cab4784a5cbb75e816b15e3d22e3e (diff) | |
| parent | 47bdf3378d62a627cfb8a54e1180c08d67078b61 (diff) | |
| download | op-kernel-dev-813ae37e6aed72cc457094b6066aa38efd66c9e9.zip op-kernel-dev-813ae37e6aed72cc457094b6066aa38efd66c9e9.tar.gz | |
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into kvm/next
Topic branch for AVX512_4VNNIW and AVX512_4FMAPS support in KVM.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v6_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c index b948d6c..15f9fc0 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c @@ -2482,10 +2482,6 @@ static int dce_v6_0_hw_fini(void *handle) static int dce_v6_0_suspend(void *handle) { - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - amdgpu_atombios_scratch_regs_save(adev); - return dce_v6_0_hw_fini(handle); } @@ -2496,8 +2492,6 @@ static int dce_v6_0_resume(void *handle) ret = dce_v6_0_hw_init(handle); - amdgpu_atombios_scratch_regs_restore(adev); - /* turn on the BL */ if (adev->mode_info.bl_encoder) { u8 bl_level = amdgpu_display_backlight_get_level(adev, |
