Commit 9a68db72 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

Revert "drm/amd/display: Match actual state during S3 resume." 



This reverts commit 4f346e65.

fix s3 hang issue.

Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent af911133

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

+0 −33
Original line number Diff line number Diff line
@@ -641,11 +641,6 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev) 
	struct drm_connector *connector;

	struct drm_crtc *crtc;

	struct drm_crtc_state *new_crtc_state;

	struct dm_crtc_state *dm_crtc_state;

	struct drm_plane *plane;

	struct drm_plane_state *plane_state;

	struct dm_plane_state *dm_plane_state;

	struct dm_atomic_state *cached_state;

	int ret = 0;

	int i;
@@ -684,34 +679,6 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev) 
	for_each_new_crtc_in_state(adev->dm.cached_state, crtc, new_crtc_state, i)

		new_crtc_state->active_changed = true;



	cached_state = to_dm_atomic_state(adev->dm.cached_state);



	/*

	 * During suspend, the cached state is saved before all streams are

	 * disabled. Refresh cached state to match actual current state before

	 * restoring it.

	 */

	WARN_ON(kref_read(&cached_state->context->refcount) > 1);

	dc_release_state(cached_state->context);



	for_each_new_crtc_in_state(adev->dm.cached_state, crtc, new_crtc_state, i) {

		dm_crtc_state = to_dm_crtc_state(new_crtc_state);

		if (dm_crtc_state->stream) {

			WARN_ON(kref_read(&dm_crtc_state->stream->refcount) > 1);

			dc_stream_release(dm_crtc_state->stream);

			dm_crtc_state->stream = NULL;

		}

	}



	for_each_new_plane_in_state(adev->dm.cached_state, plane, plane_state, i) {

		dm_plane_state = to_dm_plane_state(plane_state);

		if (dm_plane_state->dc_state) {

			WARN_ON(kref_read(&dm_plane_state->dc_state->refcount) > 1);

			dc_plane_state_release(dm_plane_state->dc_state);

			dm_plane_state->dc_state = NULL;

		}

	}



	ret = drm_atomic_helper_resume(ddev, adev->dm.cached_state);



	drm_atomic_state_put(adev->dm.cached_state);