3 files changed, 7 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 3ecd2d614f41..e2f033d420a0 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -79,6 +79,7 @@ struct dc_caps {
         bool post_blend_color_processing;
         bool force_dp_tps4_for_cp2520;
         bool disable_dp_clk_share;
+        bool psp_setup_panel_mode;
 };
 
 struct dc_dcc_surface_param {
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
index 60e3c6a73d37..752b3d62e793 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
@@ -256,6 +256,11 @@ static void setup_panel_mode(
         enum dp_panel_mode panel_mode)
 {
         uint32_t value;
+        struct dc_context *ctx = enc110->base.ctx;
+
+        /* if psp set panel mode, dal should be program it */
+        if (ctx->dc->caps.psp_setup_panel_mode)
+                return;
 
         ASSERT(REG(DP_DPHY_INTERNAL_CTRL));
         value = REG_READ(DP_DPHY_INTERNAL_CTRL);
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index 61d8e22d23c9..d43f37d99c7d 100644
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -883,6 +883,7 @@ static bool construct(
         dc->caps.i2c_speed_in_khz = 100;
         dc->caps.max_cursor_size = 128;
         dc->caps.dual_link_dvi = true;
+        dc->caps.psp_setup_panel_mode = true;
 
         dc->debug = debug_defaults;