diff mbox

i915: do not setup intel_backlight twice

Message ID 1314041950-12433-1-git-send-email-kamal@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kamal Mostafa Aug. 22, 2011, 7:39 p.m. UTC
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>
---
 drivers/gpu/drm/i915/intel_display.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Comments

Matthew Garrett Aug. 22, 2011, 7:42 p.m. UTC | #1
On Mon, Aug 22, 2011 at 12:39:10PM -0700, Kamal Mostafa wrote:
> 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>
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ee1d701..5a1ae9f 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);
 }