Commit b68ea8af authored by Alvin Lee's avatar Alvin Lee Committed by Alex Deucher
Browse files

drm/amd/display: Free phantom plane and stream properly 



[Description]
Refcount is incremented on allocation and
when adding to the context. Therefore we must
release the phantom plane and stream after
removing from the context.

Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarBrian Chang <Brian.Chang@amd.com>
Signed-off-by: default avatarAlvin Lee <Alvin.Lee2@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e6cf22ef

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c

+13 −0
Original line number Diff line number Diff line
@@ -1737,13 +1737,26 @@ bool dcn32_remove_phantom_pipes(struct dc *dc, struct dc_state *context) 
{

	int i;

	bool removed_pipe = false;

	struct dc_plane_state *phantom_plane = NULL;

	struct dc_stream_state *phantom_stream = NULL;



	for (i = 0; i < dc->res_pool->pipe_count; i++) {

		struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];

		// build scaling params for phantom pipes

		if (pipe->plane_state && pipe->stream && pipe->stream->mall_stream_config.type == SUBVP_PHANTOM) {

			phantom_plane = pipe->plane_state;

			phantom_stream = pipe->stream;



			dc_rem_all_planes_for_stream(dc, pipe->stream, context);

			dc_remove_stream_from_ctx(dc, context, pipe->stream);



			/* Ref count is incremented on allocation and also when added to the context.

			 * Therefore we must call release for the the phantom plane and stream once

			 * they are removed from the ctx to finally decrement the refcount to 0 to free.

			 */

			dc_plane_state_release(phantom_plane);

			dc_stream_release(phantom_stream);



			removed_pipe = true;

		}