Commit e14ca957 authored by Eric Yang's avatar Eric Yang Committed by Alex Deucher

drm/amd/display: combine output signal and signal

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: default avatarEric Yang <Eric.Yang2@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bd1be8e8
...@@ -36,16 +36,13 @@ ...@@ -36,16 +36,13 @@
#define TMDS_MAX_PIXEL_CLOCK_IN_KHZ_UPMOST 297000 #define TMDS_MAX_PIXEL_CLOCK_IN_KHZ_UPMOST 297000
static void update_stream_signal(struct dc_stream_state *stream) 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) struct dc_sink *dc_sink = stream->sink;
stream->signal = stream->sink->link->connector_signal;
else if (dc_sink->sink_signal == SIGNAL_TYPE_NONE)
stream->signal = dc_sink->sink_signal; stream->signal = stream->sink->link->connector_signal;
} else { else
stream->signal = stream->output_signal; stream->signal = dc_sink->sink_signal;
}
if (dc_is_dvi_signal(stream->signal)) { if (dc_is_dvi_signal(stream->signal)) {
if (stream->timing.pix_clk_khz > TMDS_MAX_PIXEL_CLOCK_IN_KHZ_UPMOST && if (stream->timing.pix_clk_khz > TMDS_MAX_PIXEL_CLOCK_IN_KHZ_UPMOST &&
......
...@@ -579,8 +579,6 @@ struct dc_stream_state { ...@@ -579,8 +579,6 @@ struct dc_stream_state {
struct colorspace_transform gamut_remap_matrix; struct colorspace_transform gamut_remap_matrix;
struct csc_transform csc_color_matrix; struct csc_transform csc_color_matrix;
enum signal_type output_signal;
enum dc_color_space output_color_space; enum dc_color_space output_color_space;
enum dc_dither_option dither_option; enum dc_dither_option dither_option;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment