| Date | Tue, 15 Feb 2011 16:15:17 -0800 | From | Greg KH <> | Subject | [260/272] drm/i915/panel: The backlight is enabled if the current value is non-zero |
| |
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
From: Indan Zupancic <indan@nul.nu>
commit c8303e7f3f3093c16ef0fa5f73280637c89d4368 upstream.
... and not if the maximum is non-zero. This fixes the typo introduced in 47356eb6728501452 and preserves the backlight value from boot.
[ickle: My thanks also to Indan Zupancic for diagnosing the original regression and suggesting the appropriate fix.] Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/gpu/drm/i915/intel_panel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -246,6 +246,6 @@ void intel_panel_setup_backlight(struct { struct drm_i915_private *dev_priv = dev->dev_private; - dev_priv->backlight_level = intel_panel_get_max_backlight(dev); + dev_priv->backlight_level = intel_panel_get_backlight(dev); dev_priv->backlight_enabled = dev_priv->backlight_level != 0; }
|