diff options
| author | Leo (Sunpeng) Li <sunpeng.li@amd.com> | 2017-11-16 21:17:27 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-11-28 23:56:46 +0100 |
| commit | 0a24bfcb2cc2cd161a0c8aae8fcbb58239d5da2b (patch) | |
| tree | f33c57c7741d67dd77db3876db7d7bf8472b23a2 /drivers/gpu | |
| parent | drm/amd/display: Fix couple more inconsistent NULL checks in dc_resource (diff) | |
| download | linux-0a24bfcb2cc2cd161a0c8aae8fcbb58239d5da2b.tar.xz linux-0a24bfcb2cc2cd161a0c8aae8fcbb58239d5da2b.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 |
1 files changed, 0 insertions, 1 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 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); |