From patchwork Sun Apr 1 21:55:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Richell X-Patchwork-Id: 149993 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 20F05B6FEE for ; Mon, 2 Apr 2012 07:55:26 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SESjt-0001K9-6N; Sun, 01 Apr 2012 21:55:09 +0000 Received: from mail.system76.com ([173.14.1.49]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SESjr-0001K4-3y for kernel-team@lists.ubuntu.com; Sun, 01 Apr 2012 21:55:07 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.system76.com (Postfix) with ESMTP id 37663B24026 for ; Sun, 1 Apr 2012 15:55:06 -0600 (MDT) X-Virus-Scanned: amavisd-new at mail.system76.com Received: from mail.system76.com ([127.0.0.1]) by localhost (mail.system76.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S2XxckNqTusn for ; Sun, 1 Apr 2012 15:55:02 -0600 (MDT) Received: from [192.168.1.103] (c-24-8-93-109.hsd1.co.comcast.net [24.8.93.109]) by mail.system76.com (Postfix) with ESMTPSA id 24B54B24025 for ; Sun, 1 Apr 2012 15:55:02 -0600 (MDT) Message-ID: <4F78CEB5.4020900@system76.com> Date: Sun, 01 Apr 2012 15:55:01 -0600 From: Carl Richell User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120313 Thunderbird/11.0 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: System76 - Intel DRM patch X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list 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 Hi, We'd like to make sure 12.04 is flawless on our next-gen laptops. A kernel patch is required to fix an offset desktop bug. The patch applies cleanly on the current precise kernel. Please see: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/968307 https://bugzilla.kernel.org/show_bug.cgi?id=43012 -- Carl References: https://bugs.freedesktop.org/show_bug.cgi?id=47271 Signed-off-by: Chris Wilson Cc: stable@kernel.org Acked-by: Robert Hooker --- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 3d9ba01..218b3db9 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2385,6 +2385,7 @@ #define PIPECONF_DISABLE 0 #define PIPECONF_DOUBLE_WIDE (1<<30) #define I965_PIPECONF_ACTIVE (1<<30) +#define PIPECONF_FRAME_START_DELAY_MASK (3<<27) #define PIPECONF_SINGLE_WIDE 0 #define PIPECONF_PIPE_UNLOCKED 0 #define PIPECONF_PIPE_LOCKED (1<<25) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6b0562b..73ea6e9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7695,6 +7695,12 @@ static void intel_sanitize_modesetting(struct drm_device *dev, struct drm_i915_private *dev_priv = dev->dev_private; u32 reg, val; + /* Clear any frame start delays used for debugging left by the BIOS */ + for_each_pipe(pipe) { + reg = PIPECONF(pipe); + I915_WRITE(reg, I915_READ(reg)& ~PIPECONF_FRAME_START_DELAY_MASK); + } + if (HAS_PCH_SPLIT(dev)) return;