Skip to content

Commit bc70c38

Browse files
Timur Kristófgregkh
authored andcommitted
drm/amd/display: Only use analog stream encoder with analog engine
[ Upstream commit 17ff034 ] Some GPUs have analog connectors that work with a DP bridge chip and don't actually have an internal DAC: Those should not use the analog stream encoders. Fixes: 5834c33 ("drm/amd/display: Add concept of analog encoders (v2)") Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Reviewed-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent a3626fd commit bc70c38

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,10 @@ struct stream_encoder *dce100_find_first_free_match_stream_enc_for_link(
979979
struct dc_link *link = stream->link;
980980
enum engine_id preferred_engine = link->link_enc->preferred_engine;
981981

982-
if (dc_is_rgb_signal(stream->signal))
982+
/* Prefer analog engine if the link encoder has one.
983+
* Otherwise, it's an external encoder.
984+
*/
985+
if (dc_is_rgb_signal(stream->signal) && link->link_enc->analog_engine != ENGINE_ID_UNKNOWN)
983986
preferred_engine = link->link_enc->analog_engine;
984987

985988
for (i = 0; i < pool->stream_enc_count; i++) {

0 commit comments

Comments
 (0)