[PATCH 2/3] unbreak imx-ipu-fb

[Sascha Hauer]

On Thu, Jun 24, 2010 at 11:49:56AM +0200, Eric Bénard wrote:
> commit c3789cd49b43ec1c414ba1b0e9f48e8ccc19f8e1 set fb0.enable to 0
> as a default. Re-enabling the display doesn't work after this.
> Removing sdc_enable_channel from imxfb_probe fix this problem.
> 
> This patch also remove verbose log from ipu_fb_disable.

I already stumbled upon this. I prefer the following patch which fixes
the enabling/disabling of the framebuffer.

Sascha

    imx ipu fb: remove checking of IPU_CHA_BUF0_RDY
    
    This check prevents the driver from successfully enabling/disabling
    the controller more than once, because the second time we get
    here the check fails and the drivers bails out. We do not need this
    check at all, so remove it.
    
    Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>

diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index 0bd86b2..d9b94e4 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -664,12 +664,6 @@ static int ipu_enable_channel(struct ipu_fb_info *fbi, enum ipu_channel channel)
 static int ipu_update_channel_buffer(struct ipu_fb_info *fbi,
 		enum ipu_channel channel, void *buf)
 {
-	u32 reg;
-
-	reg = reg_read(fbi, IPU_CHA_BUF0_RDY);
-	if (reg & (1UL << channel))
-		return -EACCES;
-
 	/* 44.3.3.1.9 - Row Number 1 (WORD1, offset 0) */
 	reg_write(fbi, dma_param_addr(channel) + 0x0008UL, IPU_IMA_ADDR);
 	reg_write(fbi, (u32)buf, IPU_IMA_DATA);

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |