From: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Date: Thu, 16 Nov 2017 20:17:27 +0000 (-0500)
Subject: drm/amd/display: Do not put drm_atomic_state on resume
X-Git-Tag: v4.15-rc2~11^2^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0a24bfcb2cc2cd161a0c8aae8fcbb58239d5da2b;p=users%2Fwilly%2Flinux.git

drm/amd/display: Do not put drm_atomic_state on resume

drm_atomic_helper_resume now puts it for us. See relevant patch here:
https://lists.freedesktop.org/archives/dri-devel/2017-October/154268.html

Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

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 5025dafb0517..3d6fbc38d95f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -716,7 +716,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);