Commit 58180a0c authored by Mikita Lipski's avatar Mikita Lipski Committed by Alex Deucher
Browse files

drm/amd/display: Release DSC before acquiring 



[why]
Need to unassign DSC from pipes that are not using it
so other pipes can acquire it. That is needed for
asic's that have unmatching number of DSC engines from
the number of pipes.

[how]
Before acquiring dsc to stream resources, first remove it.

Signed-off-by: default avatarMikita Lipski <mikita.lipski@amd.com>
Reviewed-by: default avatarEryk Brol <Eryk.Brol@amd.com>
Acked-by: default avatarAnson Jacob <Anson.Jacob@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1a10e524

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

+5 −1
Original line number Diff line number Diff line
@@ -833,6 +833,9 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, 
		if (computed_streams[i])

			continue;



		if (dcn20_remove_stream_from_ctx(stream->ctx->dc, dc_state, stream) != DC_OK)

			return false;



		mutex_lock(&aconnector->mst_mgr.lock);

		if (!compute_mst_dsc_configs_for_link(state, dc_state, stream->link)) {

			mutex_unlock(&aconnector->mst_mgr.lock);
@@ -850,7 +853,8 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, 
		stream = dc_state->streams[i];



		if (stream->timing.flags.DSC == 1)

			dc_stream_add_dsc_to_resource(stream->ctx->dc, dc_state, stream);

			if (dc_stream_add_dsc_to_resource(stream->ctx->dc, dc_state, stream) != DC_OK)

				return false;

	}



	return true;