Commit b96ab339 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher

drm/amd/display: Restore guard against default backlight value < 1 nit

Mark reports that brightness is not restored after Xorg dpms screen blank.

This behavior was introduced by commit d9e86582 ("drm/amd/display:
Simplify brightness initialization") which dropped the cached backlight
value in display code, but also removed code for when the default value
read back was less than 1 nit.

Restore this code so that the backlight brightness is restored to the
correct default value in this circumstance.
Reported-by: default avatarMark Herbert <mark.herbert42@gmail.com>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3031
Cc: stable@vger.kernel.org
Cc: Camille Cho <camille.cho@amd.com>
Cc: Krunoslav Kovac <krunoslav.kovac@amd.com>
Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
Fixes: d9e86582 ("drm/amd/display: Simplify brightness initialization")
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f528ee14
...@@ -287,8 +287,8 @@ bool set_default_brightness_aux(struct dc_link *link) ...@@ -287,8 +287,8 @@ bool set_default_brightness_aux(struct dc_link *link)
if (link && link->dpcd_sink_ext_caps.bits.oled == 1) { if (link && link->dpcd_sink_ext_caps.bits.oled == 1) {
if (!read_default_bl_aux(link, &default_backlight)) if (!read_default_bl_aux(link, &default_backlight))
default_backlight = 150000; default_backlight = 150000;
// if > 5000, it might be wrong readback // if < 1 nits or > 5000, it might be wrong readback
if (default_backlight > 5000000) if (default_backlight < 1000 || default_backlight > 5000000)
default_backlight = 150000; default_backlight = 150000;
return edp_set_backlight_level_nits(link, true, return edp_set_backlight_level_nits(link, true,
......
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