Commit cef6b5cb authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by sanglipeng
Browse files

drm/amd/display: Fix hang when skipping modeset 

stable inclusion
from stable-v5.10.180
commit 3ebe5d6d69ceba8e20b0b74e43192a6c8b49d4f0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8DDFN

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3ebe5d6d69ceba8e20b0b74e43192a6c8b49d4f0



--------------------------------

commit da5e1490 upstream.

[Why&How]

When skipping full modeset since the only state change was a front porch
change, the DC commit sequence requires extra checks to handle non
existant plane states being asked to be removed from context.

Reviewed-by: default avatarAlvin Lee <Alvin.Lee2@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent aa621ed9

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

+4 −1
Original line number Diff line number Diff line
@@ -7248,6 +7248,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
			continue;



		dc_plane = dm_new_plane_state->dc_state;

		if (!dc_plane)

			continue;



		bundle->surface_updates[planes_count].surface = dc_plane;

		if (new_pcrtc_state->color_mgmt_changed) {
@@ -8562,8 +8564,9 @@ static int dm_update_plane_state(struct dc *dc, 
			return -EINVAL;

		}





		if (dm_old_plane_state->dc_state)

			dc_plane_state_release(dm_old_plane_state->dc_state);



		dm_new_plane_state->dc_state = NULL;



		*lock_and_validation_needed = true;

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+3 −0
Original line number Diff line number Diff line
@@ -1502,6 +1502,9 @@ bool dc_remove_plane_from_context( 
	struct dc_stream_status *stream_status = NULL;

	struct resource_pool *pool = dc->res_pool;



	if (!plane_state)

		return true;



	for (i = 0; i < context->stream_count; i++)

		if (context->streams[i] == stream) {

			stream_status = &context->stream_status[i];