drm/amd/display: display connected to dp-1 does not light up

[why]
for vega, dp set_panel_mode is
handled by psp firmware. dal should not program the
register again.

[how]
dal does not program panel mode.

Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 3ecd2d614f416afd8456d084d2f66fbf7222cdaf..e2f033d420a05bb755ece975e66311c942e7767c 100644 (file)
--- 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 60e3c6a73d370c7ecbad78ee664beb3d9d19833a..752b3d62e793d02016ef45dc0c92a35ffcd0d3c2 100644 (file)
--- 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 61d8e22d23c9542af476bbcc5e0c0519ec398226..d43f37d99c7d9d2ed7bb0e37bfb58b91981914e6 100644 (file)
--- 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;