From patchwork Sun Feb 20 15:02:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 575791 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 p1KF3LJO022214 for ; Sun, 20 Feb 2011 15:03:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752275Ab1BTPDW (ORCPT ); Sun, 20 Feb 2011 10:03:22 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:62382 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753908Ab1BTPDW (ORCPT ); Sun, 20 Feb 2011 10:03:22 -0500 Received: by mail-bw0-f46.google.com with SMTP id 15so433464bwz.19 for ; Sun, 20 Feb 2011 07:03:21 -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=vGoDbH/bDFEYB+1M1+FTBUtssqqwkwpxSaIF0frSG5w=; b=ThGkvvK1drYRnxMOpEFAfEGzOW8zeFW720JZpzrdCB1GbyefGEr4tOQSSTNrBiTMxd b9YlYpswINsAQai+IKBDTVA51rKyIYk3YnVik0oF7wlxa2GJI+1Sty4Yzxr3hXSKx+Hq StpgYKr6Mm7rg/BuoHsInI6JzgavuEgFjR1Xk= 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=ctw7mwin7gQ9uG8bWOK4d7pZSfq0ZHS2C6HCQFPFFDTJLaOeehn8/566hmT97uOOio l3+IMuHOyAwG/w7t5Uodpy4fSegKvNHIEyKEjguJMZlKeLv8OEaK90OUoKIx9r7vaSTy tjsOpxwp6+CPqis2FKs28sgRUm2rpdLifsVgk= Received: by 10.204.60.17 with SMTP id n17mr374864bkh.190.1298214201439; Sun, 20 Feb 2011 07:03:21 -0800 (PST) Received: from localhost.localdomain ([80.249.93.202]) by mx.google.com with ESMTPS id b6sm3025835bkb.10.2011.02.20.07.03.19 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 20 Feb 2011 07:03:20 -0800 (PST) From: Vasily Khoruzhick To: Russell King - ARM Linux , Marek Vasut , linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Eric Miao , Sascha Hauer Cc: Vasily Khoruzhick Subject: [PATCH v2 2/3] ARM: PXA: PXAFB: Fix plane Z-ordering problem Date: Sun, 20 Feb 2011 17:02:26 +0200 Message-Id: <1298214147-11578-2-git-send-email-anarsoul@gmail.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1298214147-11578-1-git-send-email-anarsoul@gmail.com> References: <20110217110321.GF24627@n2100.arm.linux.org.uk> <1298214147-11578-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]); Sun, 20 Feb 2011 15:03:59 +0000 (UTC) diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 41a499f..54a9ab8 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -940,8 +940,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; } @@ -1825,6 +1823,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);