From patchwork Tue May 31 18:13:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Melchior FRANZ X-Patchwork-Id: 833142 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4VIDTad030091 for ; Tue, 31 May 2011 18:13:52 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B88A09EB20 for ; Tue, 31 May 2011 11:13:28 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from email.aon.at (smtpout03.highway.telekom.at [195.3.96.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EBA69E746 for ; Tue, 31 May 2011 11:13:17 -0700 (PDT) Received: (qmail 21951 invoked from network); 31 May 2011 18:13:15 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.0 (2007-05-01) on WARSBL503.highway.telekom.at X-Spam-Level: ** Received: from 188-23-12-249.adsl.highway.telekom.at (HELO server.gustav.lan) ([188.23.12.249]) (envelope-sender ) by smarthub95.highway.telekom.at (qmail-ldap-1.03) with SMTP for ; 31 May 2011 18:13:15 -0000 Received: from server.localnet (localhost [IPv6:::1]) by server.gustav.lan (Postfix) with ESMTP id 77F2526EF92; Tue, 31 May 2011 20:13:15 +0200 (CEST) From: Melchior FRANZ To: linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915: add missing intel_enable_plane() call to i9xx_crtc_mode_set() Date: Tue, 31 May 2011 20:13:14 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.39; KDE/4.6.3; x86_64; ; ) X-Fingerprint: 9FFB C079 5B78 4F27 099C C6C6 7399 02D1 919B D903 X-PGP: http://members.aon.at/mfranz/melchior.franz MIME-Version: 1.0 Message-Id: <201105312013.14986@rk-nord.at> Cc: 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 (demeter2.kernel.org [140.211.167.43]); Tue, 31 May 2011 18:13:52 +0000 (UTC) From: Melchior FRANZ Fix garbled up virtual linux console on Acer TM 5735Z-452G32Mnss (colored stripes, unreadable text) by adding the intel_enable_plane() call also to i9xx_crtc_mode_set(), which didn't inherit it from intel_crtc_mode_set() like its twin ironlake_crtc_mode_set(). Signed-off-by: Melchior FRANZ --- The bug was originally introduced with 49183b2818 and fixed with 982b2035d9, but re-introduced by a recent drm/i915 branch merge. diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f553ddf..5d20579 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4735,6 +4735,8 @@ static int i9xx_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);