Commit 0c522b65 authored by Eric Yang's avatar Eric Yang Committed by Alex Deucher

drm/amd/display: take dpms_off into account for edp turn off logic

[why]
Previously we incorrectly skipped backlight control when stream is
present but dpms_off = true. This causes backlight to remain on in
the we boot up or resume into a external display only configuration
where VBIOS posted on the eDP.

[How]
Add dpms_off into the condition for edp need to turn off.
Signed-off-by: default avatarEric Yang <Eric.Yang2@amd.com>
Reviewed-by: default avatarYongqiang Sun <yongqiang.sun@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8635c5a7
...@@ -1520,7 +1520,7 @@ static struct dc_link *get_link_for_edp(struct dc *dc) ...@@ -1520,7 +1520,7 @@ static struct dc_link *get_link_for_edp(struct dc *dc)
return NULL; return NULL;
} }
static struct dc_link *get_link_for_edp_not_in_use( static struct dc_link *get_link_for_edp_to_turn_off(
struct dc *dc, struct dc *dc,
struct dc_state *context) struct dc_state *context)
{ {
...@@ -1529,9 +1529,13 @@ static struct dc_link *get_link_for_edp_not_in_use( ...@@ -1529,9 +1529,13 @@ static struct dc_link *get_link_for_edp_not_in_use(
/* check if eDP panel is suppose to be set mode, if yes, no need to disable */ /* check if eDP panel is suppose to be set mode, if yes, no need to disable */
for (i = 0; i < context->stream_count; i++) { for (i = 0; i < context->stream_count; i++) {
if (context->streams[i]->signal == SIGNAL_TYPE_EDP) if (context->streams[i]->signal == SIGNAL_TYPE_EDP) {
if (context->streams[i]->dpms_off == true)
return context->streams[i]->sink->link;
else
return NULL; return NULL;
} }
}
/* check if there is an eDP panel not in use */ /* check if there is an eDP panel not in use */
for (i = 0; i < dc->link_count; i++) { for (i = 0; i < dc->link_count; i++) {
...@@ -1572,7 +1576,7 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) ...@@ -1572,7 +1576,7 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)
} }
if (can_edp_fast_boot_optimize) if (can_edp_fast_boot_optimize)
edp_link_to_turnoff = get_link_for_edp_not_in_use(dc, context); edp_link_to_turnoff = get_link_for_edp_to_turn_off(dc, context);
/* if OS doesn't light up eDP and eDP link is available, we want to disable /* if OS doesn't light up eDP and eDP link is available, we want to disable
* If resume from S4/S5, should optimization. * If resume from S4/S5, should optimization.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment