From patchwork Fri Mar 11 09:20:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 627821 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 p2B9LvUC022246 for ; Fri, 11 Mar 2011 09:21:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752581Ab1CKJV5 (ORCPT ); Fri, 11 Mar 2011 04:21:57 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:59439 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752038Ab1CKJV4 (ORCPT ); Fri, 11 Mar 2011 04:21:56 -0500 Received: by mail-bw0-f46.google.com with SMTP id 15so2524372bwz.19 for ; Fri, 11 Mar 2011 01:21:56 -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=ejis1FHmnEjCnqKt4FLN+AMzuMdQOpjiYUYpvNu7W+k=; b=uF1G1L9vXbxXRL47F2AC1TW7XRnp+P8bmqYYRdvVV0kOsHMj0VfsZRKX7tQx/1D1ZE uW88hlMelpGMhWSN9e9UYhl7y7mwPH44X9n+Rb3IUJrBLqt5kS2VhJDQp65O8i3TPd0A VxP6wreH01pkoMVQNwvBkPZ8kqOfGwEJX4g8Y= 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=Rpa6F/S9AHGvnHyGAFi4N9pgPTP4oc4A66709OMpkjd9VKCzc7udY/nzOXh1ied+e1 LJ/wX5m/Y1P1kbx0K0VD6n+uX+4Qyv/Bu38xH/XjVAwAT6EvocQ8PE62Q6DbmnlgeK6D NBLjCs1dXLEj1AT2aw9nO3yp3EV/Sn1yRCU6k= Received: by 10.204.169.130 with SMTP id z2mr3125926bky.137.1299835316083; Fri, 11 Mar 2011 01:21:56 -0800 (PST) Received: from localhost.localdomain ([86.57.155.118]) by mx.google.com with ESMTPS id k5sm1069647bku.16.2011.03.11.01.21.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 Mar 2011 01:21:55 -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 2/4] ARM: PXA: PXAFB: Fix plane Z-ordering problem Date: Fri, 11 Mar 2011 11:20:48 +0200 Message-Id: <1299835250-11095-2-git-send-email-anarsoul@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1299835250-11095-1-git-send-email-anarsoul@gmail.com> References: <201103060030.59584.anarsoul@gmail.com> <1299835250-11095-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]); Fri, 11 Mar 2011 09:21:58 +0000 (UTC) diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 0764759..e2f643e 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -952,8 +952,6 @@ static void __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"); } @@ -1843,6 +1841,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);