]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/amd/display: only check available pipe to disable vbios mode.
authorYongqiang Sun <yongqiang.sun@amd.com>
Fri, 16 Oct 2020 13:25:05 +0000 (09:25 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 2 Nov 2020 20:29:54 +0000 (15:29 -0500)
[Why & How]
1. only need to check first ODM pipe.
2. Only need to check eDP which is on.

Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc.c

index 1fa4a50e0a440e8fb3218c5e8957ed5aa7227db9..18154eea09f80ad53cf4975d674022ab9f5315b8 100644 (file)
@@ -861,12 +861,16 @@ static void disable_vbios_mode_if_required(
                if (stream == NULL)
                        continue;
 
+               // only looking for first odm pipe
+               if (pipe->prev_odm_pipe)
+                       continue;
+
                if (stream->link->local_sink &&
                        stream->link->local_sink->sink_signal == SIGNAL_TYPE_EDP) {
                        link = stream->link;
                }
 
-               if (link != NULL) {
+               if (link != NULL && link->link_enc->funcs->is_dig_enabled(link->link_enc)) {
                        unsigned int enc_inst, tg_inst = 0;
                        unsigned int pix_clk_100hz;