From patchwork Mon Jun 6 20:21:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 853742 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 p56KM98Y010669 for ; Mon, 6 Jun 2011 20:22:29 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A13939E97A for ; Mon, 6 Jun 2011 13:22:08 -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 808EA9E79D for ; Mon, 6 Jun 2011 13:21:59 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 27A97C74006; Mon, 6 Jun 2011 13:21:59 -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 MkQT4cGUU3js; Mon, 6 Jun 2011 13:21:56 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1033) id 0C8FDC74005; Mon, 6 Jun 2011 13:21:56 -0700 (PDT) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id E4510BF8236; Mon, 6 Jun 2011 13:21:55 -0700 (PDT) Received: by koto.keithp.com (Postfix, from userid 1488) id E838C6420D8; Mon, 6 Jun 2011 13:21:53 -0700 (PDT) From: Keith Packard To: Melchior FRANZ , linux-kernel@vger.kernel.org Subject: Re: Regression: Borked display on second output with Intel G45 in 3.0-rc2 In-Reply-To: <201106061920.07144@rk-nord.at> References: <20110606171253.GA2925@elliptictech.com> <201106061920.07144@rk-nord.at> User-Agent: Notmuch/0.5-202-g6ae4e7d (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) Date: Mon, 06 Jun 2011 13:21:53 -0700 Message-ID: MIME-Version: 1.0 Cc: Nick Bowler , 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]); Mon, 06 Jun 2011 20:24:28 +0000 (UTC) On Mon, 6 Jun 2011 19:20:06 +0200, Melchior FRANZ wrote: > That's apparently the bug that I've submitted a patch for on 2011/5/31: > https://lkml.org/lkml/2011/5/31/393 > I assume/hope it's still in someone's queue. Yeah, we "shouldn't" need to call intel_enable_plane from i9xx_crtc_mode_set as it is called immediately afterwards from i9xx_crtc_enable. In any case, there's a bogus call in ironlake_crtc_mode_set which clearly belongs in i9xx_crtc_mode_set: We need to figure out why this call (in i9xx_crtc_mode_set) is required, but that will require finding hardware that reproduces the bug and fixing it there. diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 81a9059..aa43e7b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4687,6 +4687,7 @@ 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); @@ -5217,8 +5218,6 @@ static int ironlake_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);