drm/amd/display: Add surface to dm_plane_state if fb reserve fails

Signed-off-by: Jerry Zuo <Jerry.Zuo@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 08567b3631cf1ffc3498d1d4e4ea387637f94613..41731943b4e7dd8cc6cb842b15ba8bc2f681db9d 100644 (file)
--- 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,