Commit c00a39f6 authored Apr 22, 2025 by Nicholas Kazlauskas Committed by Alex Deucher May 05, 2025

Revert "drm/amd/display: turn off eDP lcdvdd and backlight if not required"



This reverts commit 0d93e821 ("drm/amd/display: turn off eDP lcdvdd and backlight if not required")

Reason for revert: Causes S4 lightup regressions.

Reviewed-by: Gabe Teeger <gabe.teeger@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Ray Wu <ray.wu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent a063ce92

drivers/gpu/drm/amd/display/dc/core/dc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6298,10 +6298,10 @@ void dc_query_current_properties(struct dc dc, struct dc_current_properties pr
		void dc_set_edp_power(const struct dc dc, struct dc_link edp_link,
		bool powerOn)
		{
		if (!edp_link \|\| !edp_link->dc \|\| !edp_link->dc->link_srv)
		if (edp_link->connector_signal != SIGNAL_TYPE_EDP)
		return;

		if (edp_link->connector_signal != SIGNAL_TYPE_EDP)
		if (edp_link->skip_implict_edp_power_control == false)
		return;

		edp_link->dc->link_srv->edp_set_panel_power(edp_link, powerOn);

drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -393,7 +393,6 @@ void edp_set_panel_power(struct dc_link *link, bool powerOn)

		// 3. Rx power on
		dpcd_write_rx_power_ctrl(link, true);
		DC_LOG_BACKLIGHT("eDP power and backlight: Power on");
		} else {
		// 3. Rx power off
		dpcd_write_rx_power_ctrl(link, false);
		@@ -405,7 +404,6 @@ void edp_set_panel_power(struct dc_link *link, bool powerOn)
		// 1. panel VDD off
		if (!link->dc->config.edp_no_power_sequencing)
		link->dc->hwss.edp_power_control(link, false);
		DC_LOG_BACKLIGHT("eDP power and backlight: Power off");
		}
		}