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

Commit 7e98ab10 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Don't allow dual-link DVI on all ASICs. 



Our APUs (Carrizo, Stoney, Raven) don't support it.

v2: Don't use is_apu as other ASICs might also not support it

Signed-off-by: default avatarHarry Wentland <harry.wentland@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 a39438f0

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

+3 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ static void update_stream_signal(struct dc_stream_state *stream) 
		stream->signal = dc_sink->sink_signal;



	if (dc_is_dvi_signal(stream->signal)) {

		if (stream->timing.pix_clk_khz > TMDS_MAX_PIXEL_CLOCK_IN_KHZ_UPMOST &&

		if (stream->ctx->dc->caps.dual_link_dvi &&

		    stream->timing.pix_clk_khz > TMDS_MAX_PIXEL_CLOCK_IN_KHZ_UPMOST &&

		    stream->sink->sink_signal != SIGNAL_TYPE_DVI_SINGLE_LINK)

			stream->signal = SIGNAL_TYPE_DVI_DUAL_LINK;

		else

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

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ struct dc_caps { 
	bool dcc_const_color;

	bool dynamic_audio;

	bool is_apu;

	bool dual_link_dvi;

};



struct dc_dcc_surface_param {

drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ static bool construct( 
	dc->caps.max_downscale_ratio = 200;

	dc->caps.i2c_speed_in_khz = 40;

	dc->caps.max_cursor_size = 128;

	dc->caps.dual_link_dvi = true;



	for (i = 0; i < pool->base.pipe_count; i++) {

		pool->base.timing_generators[i] =

drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,8 @@ static bool construct( 
	dc->caps.max_downscale_ratio = 200;

	dc->caps.i2c_speed_in_khz = 100;

	dc->caps.max_cursor_size = 128;

	dc->caps.dual_link_dvi = true;





	/*************************************************

	 *  Create resources                             *

drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -835,6 +835,8 @@ static bool construct( 
	dc->caps.max_downscale_ratio = 200;

	dc->caps.i2c_speed_in_khz = 100;

	dc->caps.max_cursor_size = 128;

	dc->caps.dual_link_dvi = true;



	dc->debug = debug_defaults;



	/*************************************************