From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753441Ab1HVTpS (ORCPT ); Mon, 22 Aug 2011 15:45:18 -0400 Received: from qmta12.emeryville.ca.mail.comcast.net ([76.96.27.227]:43607 "EHLO qmta12.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753108Ab1HVTpR (ORCPT ); Mon, 22 Aug 2011 15:45:17 -0400 X-Greylist: delayed 352 seconds by postgrey-1.27 at vger.kernel.org; Mon, 22 Aug 2011 15:45:16 EDT From: Kamal Mostafa To: Linux Kernel , intel-gfx@lists.freedesktop.org Cc: Matthew Garrett , Keith Packard , Kamal Mostafa Subject: [PATCH] i915: do not setup intel_backlight twice Date: Mon, 22 Aug 2011 12:39:10 -0700 Message-Id: <1314041950-12433-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <20110817141010.GA21479@redhat.com> References: <20110817141010.GA21479@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 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); } -- 1.7.4.1