On 2017-10-20 01:59 PM, sunpeng.li at amd.com wrote:
> From: "Leo (Sunpeng) Li" <sunpeng.li at amd.com>
>
> Do not create dc_state within display_resume, since it's being
> constructed within atomic check.
>
> Signed-off-by: Leo (Sunpeng) Li <sunpeng.li at amd.com>
Reviewed-by: Harry Wentland <harry.wentland at amd.com>
Harry
> ---
> 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 4202fd1..b367482 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -692,10 +692,6 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev)
> * restoring it.
> */
>
> - cached_state->context = dc_create_state();
> - ASSERT(cached_state->context);
> - dc_resource_state_copy_construct_current(adev->dm.dc, cached_state->context);
> -
> for_each_new_crtc_in_state(adev->dm.cached_state, crtc, new_crtc_state, i) {
> dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
> if (dm_new_crtc_state->stream) {
>
