Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 293b9160 authored by Anthony Koo's avatar Anthony Koo Committed by Alex Deucher
Browse files

drm/amd/display: Fix issue with link_active state not correct for MST 



[Why]
For MST, link not disabled until all streams disabled

[How]
Add check for stream_count before setting link_active = false for MST

Signed-off-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Reviewed-by: default avatarWenjing Liu <Wenjing.Liu@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dcd5fb82

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

+11 −4
Original line number Diff line number Diff line
@@ -2038,6 +2038,9 @@ static enum dc_status enable_link( 
		break;

	}



	if (status == DC_OK)

		pipe_ctx->stream->link->link_status.link_active = true;



	return status;

}
@@ -2061,6 +2064,14 @@ static void disable_link(struct dc_link *link, enum signal_type signal) 
			dp_disable_link_phy_mst(link, signal);

	} else

		link->link_enc->funcs->disable_output(link->link_enc, signal);



	if (signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {

		/* MST disable link only when no stream use the link */

		if (link->mst_stream_alloc_table.stream_count <= 0)

			link->link_status.link_active = false;

	} else {

		link->link_status.link_active = false;

	}

}



static bool dp_active_dongle_validate_timing(
@@ -2624,8 +2635,6 @@ void core_link_enable_stream( 
			}

		}



		stream->link->link_status.link_active = true;



		core_dc->hwss.enable_audio_stream(pipe_ctx);



		/* turn off otg test pattern if enable */
@@ -2660,8 +2669,6 @@ void core_link_disable_stream(struct pipe_ctx *pipe_ctx, int option) 
	core_dc->hwss.disable_stream(pipe_ctx, option);



	disable_link(pipe_ctx->stream->link, pipe_ctx->stream->signal);



	pipe_ctx->stream->link->link_status.link_active = false;

}



void core_link_set_avmute(struct pipe_ctx *pipe_ctx, bool enable)