]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amd/display: Don't call find_analog_engine() twice
authorTimur Kristóf <timur.kristof@gmail.com>
Mon, 2 Feb 2026 11:25:03 +0000 (12:25 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Feb 2026 23:01:38 +0000 (15:01 -0800)
[ Upstream commit 613b1737abe1bd0a65b49851e777231302095e28 ]

The analog engine is already there in the link_analog_engine
variable and assigned to enc_init_data.analog_engine already.

I suspect this was a rebase mistake.

Fixes: 436d0d22aa70 ("drm/amd/display: Pass proper DAC encoder ID to VBIOS")
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Tested-by: Mauro Rossi <issor.oruam@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>
drivers/gpu/drm/amd/display/dc/link/link_factory.c

index d9cb6b6714009245ae909d4f9a3bd54f0847d43a..9003e0d314e00b36408b0ae813032d2061ea4ae2 100644 (file)
@@ -648,7 +648,6 @@ static bool construct_phy(struct dc_link *link,
        enc_init_data.channel = get_ddc_line(link);
        enc_init_data.hpd_source = get_hpd_line(link);
        enc_init_data.transmitter = transmitter_from_encoder;
-       enc_init_data.analog_engine = find_analog_engine(link, &enc_init_data.analog_encoder);
        enc_init_data.encoder = link_encoder;
        enc_init_data.analog_engine = link_analog_engine;