Commit 7779cee3 authored by Vasily Khoruzhick's avatar Vasily Khoruzhick Committed by Eric Miao
Browse files

ARM: pxafb: fix plane Z-ordering problem 



pxafb_overlay_init is not right place to change Z-ordering,
move it to main plane initialization.

Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 1b98d7c4

drivers/video/pxafb.c

+6 −2
Original line number Diff line number Diff line
@@ -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);