From patchwork Thu Jul 29 22:51:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Conklin X-Patchwork-Id: 60316 X-Patchwork-Delegate: steve.conklin@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id EFEC01007D2 for ; Fri, 30 Jul 2010 08:51:46 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Oebwb-0008Eg-1v; Thu, 29 Jul 2010 23:51:17 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OebwZ-0008EQ-44 for kernel-team@lists.ubuntu.com; Thu, 29 Jul 2010 23:51:15 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OebwY-0005LT-GI; Thu, 29 Jul 2010 23:51:14 +0100 Received: from ip-64-32-163-20.atl.megapath.net ([64.32.163.20] helo=[172.31.0.13]) by hutte.canonical.com with esmtpsa (SSL 3.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OebwX-0007Pl-Oi; Thu, 29 Jul 2010 23:51:14 +0100 Subject: Fixup - Re: [stable] drm/i915 patches fix Latitude E6410 video issues. From: Steve Conklin To: Manoj Iyer , Jesse Barnes In-Reply-To: References: Date: Thu, 29 Jul 2010 17:51:07 -0500 Message-ID: <1280443867.23856.77.camel@xps-1> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Cc: kernel-team , stable@kernel.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com On Wed, 2010-07-28 at 13:45 -0500, Manoj Iyer wrote: > Please consider the following upstream commits to stable 2.6.33.y > > 1. drm/i915: add PANEL_UNLOCK_REGS definition > SHAID: 4a655f043160eeae447efd3be297b6b4c397a640 > 2. drm/i915: make sure eDP panel is turned on > SHAID: 9934c132989d5c488d2e15188220ce240960ce96 > > Depends on > > 3. drm/i915: Rename intel_output to intel_encoder. > SHAID: 21d40d37eca86872f2bf0af995809ebdef25c9d9 > > > These patches fix video issues on Dell Latitude E6410. Reported in bugs > > http://launchpad.net/bugs/578673 > http://launchpad.net/bugs/561802 > > The patches apply cleanly to 2.6.33.y (see attachments), and they were > tested against the latest Lucid kernel and reported to fix the 2 issues. > Kernel was tested by user community, as well as, on hardware available at > Canonical. > > Regarding the issue with dim back-light on resume, Jesse wrote to me saying > he suspects some other agent like firmware might be a suspect in zeroing > it out before the driver saves it, ie driver seems to do the right thing. > > Regards > Manoj Iyer (as Brad pointed out) 1. I think that we're better off backporting this without the driver-wide variable rename, until/unless that lands in stable, or it's going to cause us pain for the rest of Lucid's lifetime when we take stable patches. It's a lot of change compared with the six lines in the dependent patch. 2. There was a bug in the upstream patch: drm/i915: make sure eDP panel is turned on which was fixed in a subsequent commit. backlight_off()was being called twice and panel_off() was not being called. This is fixed by including the upstream patch drm/i915: make sure we shut off the panel in eDP configs (also backported because of conflicts caused by the global rename) 3. The drm-i915-add-PANEL_UNLOCK_REGS-definition patch is fine, but needs to be applied before the others, the original patches were out of order. Attached are the three required patches in order, having dropped the rename patch, and adding the fix for panel_off(). These replace the patches proposed in the original email. They apply cleanly to lucid and to linux-2.6.33.y. Steve Conklin From 520d78adefad5f91e3616a891f0b2966d47bcfe1 Mon Sep 17 00:00:00 2001 From: Steve Conklin Date: Thu, 29 Jul 2010 16:58:43 -0500 Subject: [PATCH 3/3] UBUNTU: SAUCE: drm/i915: make sure we shut off the panel in eDP configs This patch is backported from commit 5620ae29f1eabe655f44335231b580a78c8364ea It does not apply as a cherry-pick because of a driver-wide variable rename. BugLink: http://bugs.launchpad.net/bugs/578673 OriginalAuthor: Jesse Barnes Fix error from the last pull request. Making sure we shut the panel off is more correct and saves power. Signed-off-by: Jesse Barnes Signed-off-by: Linus Torvalds Signed-off-by: Steve Conklin --- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 40ca37a..6b62762 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -757,7 +757,7 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode) intel_dp_link_down(intel_output, dp_priv->DP); if (IS_eDP(intel_output)) { ironlake_edp_backlight_off(dev); - ironlake_edp_backlight_off(dev); + ironlake_edp_panel_off(dev); } } } else { -- 1.7.0.4