aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorIndan Zupancic <indan@nul.nu>2011-01-12 11:59:19 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-12 20:24:50 +0000
commitc8303e7f3f3093c16ef0fa5f73280637c89d4368 (patch)
tree9d75bf6845964bf6dbe6b59bc129ad45590dfd6f /drivers/gpu
parent833bcb00c478c674fda0aaea089c1a92abd2da01 (diff)
downloadkernel_samsung_aries-c8303e7f3f3093c16ef0fa5f73280637c89d4368.zip
kernel_samsung_aries-c8303e7f3f3093c16ef0fa5f73280637c89d4368.tar.gz
kernel_samsung_aries-c8303e7f3f3093c16ef0fa5f73280637c89d4368.tar.bz2
drm/i915/panel: The backlight is enabled if the current value is non-zero
... 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> Cc: stable@kernel.org # after 47356eb6728501452
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_panel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index e00d200..c65992d 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -278,6 +278,6 @@ void intel_panel_setup_backlight(struct drm_device *dev)
{
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;
}