From: Jerry Zuo Date: Thu, 27 Jul 2017 19:50:26 +0000 (-0400) Subject: drm/amd/display: Add surface to dm_plane_state if fb reserve fails X-Git-Tag: v4.15-rc1~56^2~23^2~220 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d128c2f8a0d90f6e693c62423a678af4fc34bf5;p=thirdparty%2Fkernel%2Flinux.git drm/amd/display: Add surface to dm_plane_state if fb reserve fails Signed-off-by: Jerry Zuo Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher --- 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 08567b3631cf1..41731943b4e7d 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4707,6 +4707,11 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, dc_plane_state = dc_create_plane_state(dc); + if (dm_plane_state->dc_state) + dc_plane_state_release(dm_plane_state->dc_state); + + dm_plane_state->dc_state = dc_plane_state; + ret = fill_plane_attributes( plane_crtc->dev->dev_private, dc_plane_state, @@ -4716,12 +4721,6 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, if (ret) goto fail; - - if (dm_plane_state->dc_state) - dc_plane_state_release(dm_plane_state->dc_state); - - dm_plane_state->dc_state = dc_plane_state; - add_val_sets_plane(set, set_count, new_acrtc_state->stream,