Commit 4d128c2f authored by Jerry Zuo's avatar Jerry Zuo Committed by Alex Deucher
Browse files

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



Signed-off-by: default avatarJerry Zuo <Jerry.Zuo@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6dd28867

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+5 −6
Original line number Diff line number Diff line
@@ -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,