From 71eebb7a2497f45852e842f6c1f1e0fde8c67cae Mon Sep 17 00:00:00 2001 From: "Le.Ma" Date: Thu, 31 Aug 2017 11:01:36 +0800 Subject: [PATCH 0792/4131] Revert "drm/amd/display: Release cached atomic state in S3." This reverts commit db04287a68c089b3a6c2bd574208e51477fba510. --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 62e133b..f87c788 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -550,7 +550,6 @@ static int dm_suspend(void *handle) amdgpu_dm_irq_suspend(adev); - WARN_ON(adev->dm.cached_state); adev->dm.cached_state = drm_atomic_helper_suspend(adev->ddev); dc_set_power_state( @@ -650,9 +649,6 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev ) ret = drm_atomic_helper_resume(ddev, adev->dm.cached_state); - drm_atomic_state_put(adev->dm.cached_state); - adev->dm.cached_state = NULL; - amdgpu_dm_irq_resume_late(adev); return ret; -- 2.7.4