From patchwork Mon Aug 22 19:39:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 1086232 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7MJlqHF017206 for ; Mon, 22 Aug 2011 19:48:13 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F8C59F03D for ; Mon, 22 Aug 2011 12:47:52 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 22 Aug 2011 19:48:13 +0000 (UTC) X-Greylist: delayed 488 seconds by postgrey-1.31 at gabe; Mon, 22 Aug 2011 12:47:31 PDT Received: from qmta12.emeryville.ca.mail.comcast.net (qmta12.emeryville.ca.mail.comcast.net [76.96.27.227]) by gabe.freedesktop.org (Postfix) with ESMTP id 510199E88D for ; Mon, 22 Aug 2011 12:47:31 -0700 (PDT) Received: from omta17.emeryville.ca.mail.comcast.net ([76.96.30.73]) by qmta12.emeryville.ca.mail.comcast.net with comcast id PXTK1h0071afHeLACXfJo2; Mon, 22 Aug 2011 19:39:18 +0000 Received: from fourier ([98.234.59.163]) by omta17.emeryville.ca.mail.comcast.net with comcast id PXgW1h0123XJlnE8dXgYsH; Mon, 22 Aug 2011 19:40:38 +0000 Received: from kamal by fourier with local (Exim 4.74) (envelope-from ) id 1QvaL1-0003F6-Kf; Mon, 22 Aug 2011 12:39:11 -0700 From: Kamal Mostafa To: Linux Kernel , intel-gfx@lists.freedesktop.org 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> Cc: Matthew Garrett Subject: [Intel-gfx] [PATCH] i915: do not setup intel_backlight twice X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.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 ACKed-by: Matthew Garrett --- 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); }