diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-10-19 14:40:58 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-10-21 11:18:11 -0400 |
| commit | e695e77c6b49c49e5eafdc6239d6b22bfa30c7cc (patch) | |
| tree | 1a8c2629b4ae220889dd96a2bdda49d6d5453fc4 /drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | |
| parent | 08e23a02e3e2dd6dde0f2f5bb90d03f5bc2a5804 (diff) | |
| download | op-kernel-dev-e695e77c6b49c49e5eafdc6239d6b22bfa30c7cc.zip op-kernel-dev-e695e77c6b49c49e5eafdc6239d6b22bfa30c7cc.tar.gz | |
drm/amdgpu: move atom scratch register save/restore to common code
We need this for more than just DCE. Move it out of the DCE modules
and into the device code. This way we can be sure the scratch registers
are initialized properly before we run asic_init which happens before
DCE IPs are restored.
Fixes atombios hangs in asic_init.
Reviewed-by: JimQu <Jim.Qu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v10_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index 4108c68..9260cae 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -3151,10 +3151,6 @@ static int dce_v10_0_hw_fini(void *handle) static int dce_v10_0_suspend(void *handle) { - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - - amdgpu_atombios_scratch_regs_save(adev); - return dce_v10_0_hw_fini(handle); } @@ -3165,8 +3161,6 @@ static int dce_v10_0_resume(void *handle) ret = dce_v10_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, |
