]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amd/display: Pass connector id when executing VBIOS CT
authorMikita Lipski <mikita.lipski@amd.com>
Tue, 17 Jul 2018 14:52:19 +0000 (10:52 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Sep 2018 07:46:59 +0000 (09:46 +0200)
commit 433149130c31de3f63b17b4ce08b45dab208f7e8 upstream.

[why]
Older ASICs require both phys_id and connector_id
to execute bios command table. If we are not passing the
right connector_id - it can lead to a black screen.

[how]
Set connector_obj_id when executing vbios command table

Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
Reviewed-by: Hersen Wu <hersenxs.wu@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c

index dbe3b26b6d9eb6134bf34f184827a19841d28cbd..f6ec1d3dfd0cfb2d7febc55a69df3ba809507355 100644 (file)
@@ -919,7 +919,7 @@ void dce110_link_encoder_enable_tmds_output(
        enum bp_result result;
 
        /* Enable the PHY */
-
+       cntl.connector_obj_id = enc110->base.connector;
        cntl.action = TRANSMITTER_CONTROL_ENABLE;
        cntl.engine_id = enc->preferred_engine;
        cntl.transmitter = enc110->base.transmitter;
@@ -961,7 +961,7 @@ void dce110_link_encoder_enable_dp_output(
         * We need to set number of lanes manually.
         */
        configure_encoder(enc110, link_settings);
-
+       cntl.connector_obj_id = enc110->base.connector;
        cntl.action = TRANSMITTER_CONTROL_ENABLE;
        cntl.engine_id = enc->preferred_engine;
        cntl.transmitter = enc110->base.transmitter;