From patchwork Wed Jul 28 18:45:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 60168 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 4A3FDB6F0E for ; Thu, 29 Jul 2010 04:45: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 1OeBdD-0001tg-P5; Wed, 28 Jul 2010 19:45:31 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OeBd9-0001tR-18 for kernel-team@lists.ubuntu.com; Wed, 28 Jul 2010 19:45:27 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OeBd8-0003Op-Ba; Wed, 28 Jul 2010 19:45:26 +0100 Received: from [70.114.236.114] (helo=lazy.local) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OeBd6-0000v9-UT; Wed, 28 Jul 2010 19:45:26 +0100 Date: Wed, 28 Jul 2010 13:45:21 -0500 (CDT) From: Manoj Iyer To: stable@kernel.org Subject: [stable] drm/i915 patches fix Latitude E6410 video issues. Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-ID: Cc: kernel-team@lists.ubuntu.com, jbarnes@virtuousgeek.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: Manoj Iyer List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 From c2c8974fa36741068d0a7c178dd8eb64dd3d1a0f Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 22 Jul 2010 13:18:18 -0700 Subject: [PATCH 3/3] drm/i915: add PANEL_UNLOCK_REGS definition In some cases, unlocking the panel regs is safe and can help us avoid a flickery, full mode set sequence. So define the unlock key and use it. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt (cherry picked from commit 4a655f043160eeae447efd3be297b6b4c397a640) Signed-off-by: Manoj Iyer Buglink: http://launchpad.net/bugs/578673 http://launchpad.net/bugs/561802 --- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 30a2322..b048c74 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2445,6 +2445,7 @@ #define PCH_PP_STATUS 0xc7200 #define PCH_PP_CONTROL 0xc7204 +#define PANEL_UNLOCK_REGS (0xabcd << 16) #define EDP_FORCE_VDD (1 << 3) #define EDP_BLC_ENABLE (1 << 2) #define PANEL_POWER_RESET (1 << 1) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 89d521d..d3895a6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3932,7 +3932,8 @@ static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule) DRM_DEBUG_DRIVER("upclocking LVDS\n"); /* Unlock panel regs */ - I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16)); + I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | + PANEL_UNLOCK_REGS); dpll &= ~DISPLAY_RATE_SELECT_FPA1; I915_WRITE(dpll_reg, dpll); @@ -3975,7 +3976,8 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc) DRM_DEBUG_DRIVER("downclocking LVDS\n"); /* Unlock panel regs */ - I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16)); + I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | + PANEL_UNLOCK_REGS); dpll |= DISPLAY_RATE_SELECT_FPA1; I915_WRITE(dpll_reg, dpll); -- 1.7.0.4