From patchwork Tue Oct 16 15:33:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris J Arges X-Patchwork-Id: 191822 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 D9CC62C0098 for ; Wed, 17 Oct 2012 02:33:35 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TO98v-0001c0-1I; Tue, 16 Oct 2012 15:33:17 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TO98s-0001bv-Oq for kernel-team@lists.ubuntu.com; Tue, 16 Oct 2012 15:33:14 +0000 Received: from cpe-70-112-44-241.austin.res.rr.com ([70.112.44.241] helo=[192.168.1.117]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1TO98s-0007nI-JN for kernel-team@lists.ubuntu.com; Tue, 16 Oct 2012 15:33:14 +0000 Message-ID: <507D7E3A.1030502@canonical.com> Date: Tue, 16 Oct 2012 10:33:14 -0500 From: Chris J Arges User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: Ubuntu Kernel Team Subject: [Precise][SRU] drm/i915: Remove too early plane enable on pre-PCH hardware X-Enigmail-Version: 1.4.5 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 SRU Justification: Impact: Users with an Intel GMA X3000 graphics card experience display corruption when using Precise. This occurs when there is a resolution change. Fix: Commit c7bd4c25650704d4d065eb4ce2a122d2a80ce804 fixes this issue, and is currently in Quantal. Cherry-picking this patch causes the display to work properly even after extensive resolution changes. Testcase: Change resolution repeatedly using xrandr on a computer with the Intel GMA X3000 graphics card. Check for display corruption. BugLink: http://bugs.launchpad.net/bugs/949130 Acked-by: Colin Ian King From e0ee9beceb24baaadb2675d0bb172afc07cbb073 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 10 Oct 2012 12:25:45 -0500 Subject: [PATCH] drm/i915: Remove too early plane enable on pre-PCH hardware Enabling the plane before we have assigned valid address means that it will access random PTE (often with conflicting memory types) and cause GPU lockups. However, enabling the plane too early appears to workaround a number of bugs in our modesetting code. Cc: Franz Melchior References: https://bugs.freedesktop.org/show_bug.cgi?id=39947 References: https://bugs.freedesktop.org/show_bug.cgi?id=41091 References: https://bugs.freedesktop.org/show_bug.cgi?id=49041 Signed-off-by: Chris Wilson Acked-by: Jesse Barnes Signed-off-by: Daniel Vetter (cherry-picked from c7bd4c25650704d4d065eb4ce2a122d2a80ce804) BugLink: http://bugs.launchpad.net/bugs/949130 Signed-off-by: Chris J Arges --- drivers/gpu/drm/i915/intel_display.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a1e9eb9..6374be5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5192,7 +5192,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, I915_WRITE(DSPCNTR(plane), dspcntr); POSTING_READ(DSPCNTR(plane)); - intel_enable_plane(dev_priv, plane, pipe); ret = intel_pipe_set_base(crtc, x, y, old_fb); -- 1.7.9.5