drm/amd/display: combine output signal and signal (e14ca957) · Commits · 戴 / test

output signal used to be a public member to be used by DM to override the stream signal. Now since there is no longer separation between public and private part of stream, they are combined. The overriding was not working properly as well, which is addressed by this change Signed-off-by:

Eric Yang <Eric.Yang2@amd.com> Reviewed-by:

Tony Cheng <Tony.Cheng@amd.com> Acked-by:

Harry Wentland <harry.wentland@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+6 −9

Original line number	Diff line number	Diff line
		@@ -36,16 +36,13 @@
		#define TMDS_MAX_PIXEL_CLOCK_IN_KHZ_UPMOST 297000
		static void update_stream_signal(struct dc_stream_state *stream)
		{
		if (stream->output_signal == SIGNAL_TYPE_NONE) {

		struct dc_sink *dc_sink = stream->sink;

		if (dc_sink->sink_signal == SIGNAL_TYPE_NONE)
		stream->signal = stream->sink->link->connector_signal;
		else
		stream->signal = dc_sink->sink_signal;
		} else {
		stream->signal = stream->output_signal;
		}

		if (dc_is_dvi_signal(stream->signal)) {
		if (stream->timing.pix_clk_khz > TMDS_MAX_PIXEL_CLOCK_IN_KHZ_UPMOST &&

drivers/gpu/drm/amd/display/dc/dc.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -579,8 +579,6 @@ struct dc_stream_state {
		struct colorspace_transform gamut_remap_matrix;
		struct csc_transform csc_color_matrix;

		enum signal_type output_signal;

		enum dc_color_space output_color_space;
		enum dc_dither_option dither_option;

Admin message