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>
This commit is contained in:
Jerry Zuo 2017-07-27 15:50:26 -04:00 committed by Alex Deucher
parent 6dd28867b1
commit 4d128c2f8a

View File

@ -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,