Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3d7bad8 authored by Roman Li's avatar Roman Li Committed by Alex Deucher
Browse files

drm/amd/display: fix brightness level after resume from suspend 



Adding missing call to cache current backlight values.
Otherwise the brightness resets to default value on resume.

Signed-off-by: default avatarRoman Li <Roman.Li@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent af2ac326

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

+13 −0
Original line number Diff line number Diff line
@@ -1997,6 +1997,19 @@ bool dc_link_set_backlight_level(const struct dc_link *link, uint32_t level, 
	return true;

}



bool dc_link_set_abm_disable(const struct dc_link *link)

{

	struct dc  *core_dc = link->ctx->dc;

	struct abm *abm = core_dc->res_pool->abm;



	if ((abm == NULL) || (abm->funcs->set_backlight_level == NULL))

		return false;



	abm->funcs->set_abm_immediate_disable(abm);



	return true;

}



bool dc_link_set_psr_enable(const struct dc_link *link, bool enable, bool wait)

{

	struct dc  *core_dc = link->ctx->dc;

drivers/gpu/drm/amd/display/dc/dc_link.h

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ static inline struct dc_link *dc_get_link_at_index(struct dc *dc, uint32_t link_ 
bool dc_link_set_backlight_level(const struct dc_link *dc_link, uint32_t level,

		uint32_t frame_ramp, const struct dc_stream_state *stream);



bool dc_link_set_abm_disable(const struct dc_link *dc_link);



bool dc_link_set_psr_enable(const struct dc_link *dc_link, bool enable, bool wait);



bool dc_link_get_psr_state(const struct dc_link *dc_link, uint32_t *psr_state);

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+3 −1
Original line number Diff line number Diff line
@@ -1016,8 +1016,10 @@ void dce110_blank_stream(struct pipe_ctx *pipe_ctx) 
	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->sink->link;



	if (link->local_sink && link->local_sink->sink_signal == SIGNAL_TYPE_EDP)

	if (link->local_sink && link->local_sink->sink_signal == SIGNAL_TYPE_EDP) {

		link->dc->hwss.edp_backlight_control(link, false);

		dc_link_set_abm_disable(link);

	}



	if (dc_is_dp_signal(pipe_ctx->stream->signal))

		pipe_ctx->stream_res.stream_enc->funcs->dp_blank(pipe_ctx->stream_res.stream_enc);