diff options
| author | Kamal Mostafa <kamal@canonical.com> | 2011-08-22 21:39:10 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-08-22 23:59:35 +0200 |
| commit | a2cc797d2d1a116b607de353de0ae1c2cab80b74 (patch) | |
| tree | 314254656e1b9c0b5dd540764ca718255b5e1693 /drivers | |
| parent | Linux 3.1-rc3 (diff) | |
| download | linux-a2cc797d2d1a116b607de353de0ae1c2cab80b74.tar.xz linux-a2cc797d2d1a116b607de353de0ae1c2cab80b74.zip | |
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>
ACKed-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.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 ee1d701317f7..5a1ae9f06cb4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7238,8 +7238,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); } |