drm/i915: Revive combination mode for backlight control
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Mar 2011 13:02:12 +0000 (14:02 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 21:06:57 +0000 (13:06 -0800)
commitba3820ade317ee36e496b9b40d2ec3987dd4aef0
treebe8082dc4aa46c14c231e7e3a5dc16f65da87d0d
parent35d34df711e8b44846e759d8cfddb4ec6877cccb
drm/i915: Revive combination mode for backlight control

This reverts commit 951f3512dba5bd44cda3e5ee22b4b522e4bb09fb

    drm/i915: Do not handle backlight combination mode specially

since this commit introduced other regressions due to untouched LBPC
register, e.g. the backlight dimmed after resume.

In addition to the revert, this patch includes a fix for the original
issue (weird backlight levels) by removing the wrong bit shift for
computing the current backlight level.
Also, including typo fixes (lpbc -> lbpc).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34524
Acked-by: Indan Zupancic <indan@nul.nu>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_panel.c