Commit 77ca136e76732ec03cc71c8b802c5fef8a70e0dd

Authored by Jeremiah Mahler
Committed by Greg Kroah-Hartman
1 parent 50a466845f

drm/i915: fix inconsistent brightness after resume

commit 13f3fbe827d09e3182023c8c54058cbf97aa146e upstream.

commit 6dda730e55f412a6dfb181cae6784822ba463847
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Tue Jun 24 18:27:40 2014 +0300

    drm/i915: respect the VBT minimum backlight brightness

introduced a bug which resulted in inconsistent brightness levels on
different machines. If a suspended was entered with the screen off some
machines would resume with the screen at minimum brightness and others
at maximum brightness.

The following commands can be used to produce this behavior.

  xset dpms force off
  sleep 1
  sudo systemctl suspend
  (resume ...)

The root cause of this problem is a comparison which checks to see if
the backlight level is zero when the panel is enabled.  If it is zero,
it is set to the maximum level.  Unfortunately, not all machines have a
minimum level of zero. On those machines the level is left at the
minimum instead of begin set to the maximum.

Fix the bug by updating the comparison to check for the minimum
backlight level instead of zero.  Also, expand the comparison for
the possible case when the level is less than the minimum.

Fixes: 6dda730e55f4 ("respect the VBT minimum backlight brightness")
Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/gpu/drm/i915/intel_panel.c
... ... @@ -947,7 +947,7 @@
947 947  
948 948 WARN_ON(panel->backlight.max == 0);
949 949  
950   - if (panel->backlight.level == 0) {
  950 + if (panel->backlight.level <= panel->backlight.min) {
951 951 panel->backlight.level = panel->backlight.max;
952 952 if (panel->backlight.device)
953 953 panel->backlight.device->props.brightness =