Applied.
On Fri, Mar 11, 2011 at 5:20 PM, Vasily Khoruzhick <anarsoul@xxxxxxxxx> wrote:
> pxafb_overlay_init is not right place to change Z-ordering,
> move it to main plane initialization.
>
> Signed-off-by: Vasily Khoruzhick <anarsoul@xxxxxxxxx>
> ---
> Âdrivers/video/pxafb.c | Â Â8 ++++++--
> Â1 files changed, 6 insertions(+), 2 deletions(-)
>
> 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);
> --
> 1.7.4.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
