diff options
author | Kamal Mostafa <kamal@canonical.com> | 2011-08-22 11:06:20 -0700 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2011-09-12 09:09:40 -0600 |
commit | 79989c3957ebf8129bace2f552840b7061b7a6d6 (patch) | |
tree | 23b1b72833302ba31f4ea6ca8f95222a4ad0c975 /drivers | |
parent | d68ab0023259db7327d69e55dd4ae6d5fc8e297f (diff) |
UBUNTU: SAUCE: i915: do not setup intel_backlight twice
The commit "Not all systems expose a firmware or platform mechanism for
changing the backlight intensity on i915, so add native driver support"
adds calls to intel_panel_setup_backlight() from intel_{lvds,dp}_init
so do not call it again from intel_setup_outputs().
BugLink: http://bugs.launchpad.net/bugs/831542
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5609c065aaf..e917c7b853b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6827,8 +6827,6 @@ static void intel_setup_outputs(struct drm_device *dev) intel_encoder_clones(dev, encoder->clone_mask); } - intel_panel_setup_backlight(dev); - /* disable all the possible outputs/crtcs before entering KMS mode */ drm_helper_disable_unused_functions(dev); } |