Skip to content

Commit c00a39f

Browse files
Nicholas Kazlauskasalexdeucher
authored andcommitted
Revert "drm/amd/display: turn off eDP lcdvdd and backlight if not required"
This reverts commit 0d93e82 ("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>
1 parent a063ce9 commit c00a39f

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6298,10 +6298,10 @@ void dc_query_current_properties(struct dc *dc, struct dc_current_properties *pr
62986298
void dc_set_edp_power(const struct dc *dc, struct dc_link *edp_link,
62996299
bool powerOn)
63006300
{
6301-
if (!edp_link || !edp_link->dc || !edp_link->dc->link_srv)
6301+
if (edp_link->connector_signal != SIGNAL_TYPE_EDP)
63026302
return;
63036303

6304-
if (edp_link->connector_signal != SIGNAL_TYPE_EDP)
6304+
if (edp_link->skip_implict_edp_power_control == false)
63056305
return;
63066306

63076307
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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ void edp_set_panel_power(struct dc_link *link, bool powerOn)
393393

394394
// 3. Rx power on
395395
dpcd_write_rx_power_ctrl(link, true);
396-
DC_LOG_BACKLIGHT("eDP power and backlight: Power on");
397396
} else {
398397
// 3. Rx power off
399398
dpcd_write_rx_power_ctrl(link, false);
@@ -405,7 +404,6 @@ void edp_set_panel_power(struct dc_link *link, bool powerOn)
405404
// 1. panel VDD off
406405
if (!link->dc->config.edp_no_power_sequencing)
407406
link->dc->hwss.edp_power_control(link, false);
408-
DC_LOG_BACKLIGHT("eDP power and backlight: Power off");
409407
}
410408
}
411409

0 commit comments

Comments
 (0)