aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-11 12:06:04 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-11 15:27:04 -0500
commit47356eb67285014527a5ab87543ba1fae3d1e10a (patch)
tree99281f2efc166c00930060dfa80d1af47509e2c8 /drivers/gpu/drm/i915/intel_display.c
parent97aaf910731b03b27b1c4c8a58006a1dc99dcd9a (diff)
drm/i915/panel: Only record the backlight level when it is enabled
By tracking the current status of the backlight we can prevent recording the value of the current backlight when we have disabled it. And so prevent restoring it to 'off' after an unbalanced sequence of intel_lvds_disable/enable. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=22672 Tested-by: Alex Riesen <raa.lkml@gmail.com> Tested-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: stable@kernel.org
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f4d1797350f6..bc829bbc14c8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5802,6 +5802,8 @@ static void intel_setup_outputs(struct drm_device *dev)
5802 encoder->base.possible_clones = 5802 encoder->base.possible_clones =
5803 intel_encoder_clones(dev, encoder->clone_mask); 5803 intel_encoder_clones(dev, encoder->clone_mask);
5804 } 5804 }
5805
5806 intel_panel_setup_backlight(dev);
5805} 5807}
5806 5808
5807static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb) 5809static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)