From patchwork Thu Feb 17 07:43:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 569491 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1H7j0uD011198 for ; Thu, 17 Feb 2011 07:45:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753507Ab1BQHoa (ORCPT ); Thu, 17 Feb 2011 02:44:30 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:61506 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753325Ab1BQHo2 (ORCPT ); Thu, 17 Feb 2011 02:44:28 -0500 Received: by mail-bw0-f46.google.com with SMTP id 15so1419964bwz.19 for ; Wed, 16 Feb 2011 23:44:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=5yenT0Zww6GHUx2idqkL/owgxXYE1YzlNbpQQGLn86c=; b=vSQY1j2rlyJ8v7JwoNYAz9EuY4l37OcZ3c0bUnyKPqkeRJl6ZhppAhgxgjVfD903H7 7ypcPnfA+MfruMX/tuefmNQE2e/WEyzc4WEInZa2Mw7qdV2fZhrz09+9XoJ9M3Tvq0dX feYWgWmrWltO1QJMynshHsBaEcCvMp9BGHAHU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=mEpglOzcb1HM85cTGFuV8J6KrNkvq3Q8vpHDE7dYADpDGeuFuleNFwmliifksLcD8v 9fA7xwguecaR8/s/kaVD7cKx8KMIKoyp4+XMWPxdGL4Ju7vzZUo2GYy2v9qFgMnVtLml c61JqCHzORIO+rk1Ptwx1B0NRsrur+f4r4Uto= Received: by 10.204.138.130 with SMTP id a2mr1285838bku.211.1297928668157; Wed, 16 Feb 2011 23:44:28 -0800 (PST) Received: from localhost.localdomain ([46.28.101.209]) by mx.google.com with ESMTPS id u23sm430189bkw.9.2011.02.16.23.44.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Feb 2011 23:44:27 -0800 (PST) From: Vasily Khoruzhick To: Marek Vasut , linux-fbdev@vger.kernel.org, "Russell King - ARM Linux" , linux-arm-kernel@lists.infradead.org, Eric Miao Cc: Vasily Khoruzhick Subject: [PATCH 2/2] ARM: PXA: PXAFB: fix plane Z-ordering problem Date: Thu, 17 Feb 2011 09:43:08 +0200 Message-Id: <1297928588-10545-2-git-send-email-anarsoul@gmail.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1297928588-10545-1-git-send-email-anarsoul@gmail.com> References: <201102151718.00800.anarsoul@gmail.com> <1297928588-10545-1-git-send-email-anarsoul@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.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, 17 Feb 2011 07:45:05 +0000 (UTC) diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index c6aad56..590a99a 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -942,8 +942,6 @@ static int __devinit pxafb_overlay_init(struct pxafb_info *fbi) /* mask all IU/BS/EOF/SOF interrupts */ lcd_writel(fbi, LCCR5, ~0); - /* place overlay(s) on top of base */ - fbi->lccr0 |= LCCR0_OUC; pr_info("PXA Overlay driver loaded successfully!\n"); return 0; } @@ -1827,6 +1825,12 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev) pxafb_decode_mach_info(fbi, inf); +#ifdef CONFIG_FB_PXA_OVERLAY + /* place overlay(s) on top of base */ + if (pxafb_overlay_supported()) + fbi->lccr0 |= LCCR0_OUC; +#endif + init_waitqueue_head(&fbi->ctrlr_wait); INIT_WORK(&fbi->task, pxafb_task); mutex_init(&fbi->ctrlr_lock);