drm/amd/display: Fix logic that causes segfault on DP display.

Signed-off-by: Zeyu Fan <Zeyu.Fan@amd.com>
Acked-by: Jordan Lazare <Jordan.Lazare@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
index 87eba4be3249a3a8e8a6605fccfcb8c3bf651fb1..26742e038274c32573994765af7148002804abdb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
@@ -852,17 +852,19 @@ static bool dce110_program_pix_clk(
                 * during PLL Reset, but they do not have effect
                 * until SS_EN is asserted.*/
                if (clock_source->id != CLOCK_SOURCE_ID_EXTERNAL
-                       && pix_clk_params->flags.ENABLE_SS && !dc_is_dp_signal(
-                                                       pix_clk_params->signal_type)) {
-                       if (!enable_spread_spectrum(clk_src,
-                                                       pix_clk_params->signal_type,
-                                                       pll_settings))
-                               return false;
+                               && !dc_is_dp_signal(pix_clk_params->signal_type)) {
+
+                       if (pix_clk_params->flags.ENABLE_SS)
+                               if (!enable_spread_spectrum(clk_src,
+                                                               pix_clk_params->signal_type,
+                                                               pll_settings))
+                                       return false;
+
+                       /* Resync deep color DTO */
+                       dce110_program_pixel_clk_resync(clk_src,
+                                               pix_clk_params->signal_type,
+                                               pix_clk_params->color_depth);
                }
-               /* Resync deep color DTO */
-               dce110_program_pixel_clk_resync(clk_src,
-                                       pix_clk_params->signal_type,
-                                       pix_clk_params->color_depth);
 
                break;
        case DCE_VERSION_11_2: