drm/amd/display: Check lid state to determine fast boot optimization.

For legacy enable boot up with lid closed, eDP information couldn't be
read correctly via SBIOS_SCRATCH_3 results in eDP cannot be light up
properly when open lid.
Check lid state instead can resolve the issue.

Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Eric Yang <eric.yang2@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
index d7e6d53bb3834828fd36877fff40fb736b24c2c0..11b3433d6432ce6172b3e5d77e77a3baa28edeaf 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
@@ -92,6 +92,7 @@ struct dc_stream_state {
        int phy_pix_clk;
        enum signal_type signal;
        bool dpms_off;
+       bool lid_state_closed;
 
        struct dc_stream_status status;
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 1b5c11c8fa1fc0d9b2eac3c26908a4e9518b62d3..4a4b3bcd4230d52296252b2f046a54577e585e62 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1471,6 +1471,17 @@ static void disable_vga_and_power_gate_all_controllers(
        }
 }
 
+static bool is_eDP_lid_closed(struct dc_state *context)
+{
+       int i;
+
+       for (i = 0; i < context->stream_count; i++) {
+               if (context->streams[i]->signal == SIGNAL_TYPE_EDP)
+                       return context->streams[i]->lid_state_closed;
+       }
+       return false;
+}
+
 static struct dc_link *get_link_for_edp_not_in_use(
                struct dc *dc,
                struct dc_state *context)
@@ -1505,20 +1516,17 @@ static struct dc_link *get_link_for_edp_not_in_use(
  */
 void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)
 {
-       struct dc_bios *dcb = dc->ctx->dc_bios;
-
-       /* vbios already light up eDP, so we can leverage vbios and skip eDP
+       /* check eDP lid state:
+        * If lid is open, vbios already light up eDP, so we can leverage vbios and skip eDP
         * programming
         */
-       bool can_eDP_fast_boot_optimize =
-                       (dcb->funcs->get_vga_enabled_displays(dc->ctx->dc_bios) == ATOM_DISPLAY_LCD1_ACTIVE);
-
-       /* if OS doesn't light up eDP and eDP link is available, we want to disable */
+       bool lid_state_closed = is_eDP_lid_closed(context);
        struct dc_link *edp_link_to_turnoff = NULL;
 
-       if (can_eDP_fast_boot_optimize) {
+       if (!lid_state_closed) {
                edp_link_to_turnoff = get_link_for_edp_not_in_use(dc, context);
 
+               /* if OS doesn't light up eDP and eDP link is available, we want to disable */
                if (!edp_link_to_turnoff)
                        dc->apply_edp_fast_boot_optimization = true;
        }