diff options
| author | Indan Zupancic <indan@nul.nu> | 2011-01-12 11:59:19 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 15:15:19 -0800 |
| commit | b07a47f14ec9a2a6c73da3f3ee856d4cc0b36b1b (patch) | |
| tree | 90c7968c605a8fbdedc59591eba27d011b822cc7 | |
| parent | 3719e122dd3ae24d3419c261647bada674ff9246 (diff) | |
| download | linux-hpc-b07a47f14ec9a2a6c73da3f3ee856d4cc0b36b1b.tar.gz | |
drm/i915/panel: The backlight is enabled if the current value is non-zero
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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 2 |
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 07014d96242bda..0df86b54845b4a 100644 --- 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 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; } |