From patchwork Thu May 12 18:52:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 780722 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4CIqjWw007580 for ; Thu, 12 May 2011 18:53:06 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 044C69E7BB for ; Thu, 12 May 2011 11:52:45 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 594319E759 for ; Thu, 12 May 2011 11:52:36 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id F22C276022A; Thu, 12 May 2011 11:52:35 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id YWFGsL32VT1C; Thu, 12 May 2011 11:52:32 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1033) id 8DB54760229; Thu, 12 May 2011 11:52:32 -0700 (PDT) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 6CF9E7600DD; Thu, 12 May 2011 11:52:32 -0700 (PDT) Received: by koto.keithp.com (Postfix, from userid 1488) id 3C9C878466; Thu, 12 May 2011 11:52:30 -0700 (PDT) From: Keith Packard To: Melchior FRANZ , linux-kernel@vger.kernel.org Subject: [PATCH] Revert "drm/i915: Only enable the plane after setting the fb base (pre-ILK)" In-Reply-To: <201105121849.09225@rk-nord.at> References: <201105121849.09225@rk-nord.at> User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) Date: Thu, 12 May 2011 11:52:29 -0700 Message-ID: MIME-Version: 1.0 Cc: Linus Torvalds , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 12 May 2011 18:53:17 +0000 (UTC) This reverts commit 49183b2818de6899383bb82bc032f9344d6791ff. Franz Melchior: This patch introduces a bug on my infamous "Acer Travelmate 5735Z-452G32Mnss": when KMS takes over, the frame buffer contents get completely garbled up on screen, with colored stripes and unreadable text (photo on request). Only when X11 is started, the screen gets restored again. Closing and re-opening the lid partly cures the mess, too: it makes the font readable, though horizontally stretched. --- On Thu, 12 May 2011 18:49:08 +0200, Melchior FRANZ wrote: > * Linus Torvalds -- Tuesday 10 May 2011: > > But please do test, just to make sure that 39-final is good. > > > Chris Wilson (4): > > drm/i915: Only enable the plane after setting the fb base (pre-ILK) > > This patch introduces a bug on my infamous "Acer Travelmate > 5735Z-452G32Mnss": when KMS takes over, the frame buffer contents > get completely garbled up on screen, with colored stripes and > unreadable text (photo on request). Only when X11 is started, the > screen gets restored again. Closing and re-opening the lid partly > cures the mess, too: it makes the font readable, though horizontally > stretched. > > Reverting 49183b2818de6899383bb82bc032f9344d6791ff fixes the > bug. It's Whack-a-Mole time! Fix one laptop, break another. We'll pick 'no regressions' over 'fixes existing bug' today. drivers/gpu/drm/i915/intel_display.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 373c2a0..2166ee0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5154,6 +5154,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, I915_WRITE(DSPCNTR(plane), dspcntr); POSTING_READ(DSPCNTR(plane)); + if (!HAS_PCH_SPLIT(dev)) + intel_enable_plane(dev_priv, plane, pipe); ret = intel_pipe_set_base(crtc, x, y, old_fb);