Skip to content

Commit

Permalink
video: da8xx: Register IRQ as last thing in driver probing.
Browse files Browse the repository at this point in the history
Following commit exposed a bug in driver:

	"fbdev: da8xx/omap-l1xx: implement double buffering"

Bug is, if interrupt handler is called before initialization is
finished, raster controller is enabled and following register
modifications causes hardware to stay in a broken state.

By looking at this one may say that proper locking is missing in
this driver, and a more proper fix should be prepared. However,
aformentioned commit causes a regression in the driver and some
fix to current one should be applied first.

Signed-off-by: Caglar Akyuz <caglar@bilkon-kontrol.com.tr>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Caglar Akyuz authored and Paul Mundt committed Dec 1, 2010
1 parent 22a9594 commit 93c176f
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/video/da8xx-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1029,10 +1029,6 @@ static int __init fb_probe(struct platform_device *device)
goto err_release_pl_mem;
}

ret = request_irq(par->irq, lcdc_irq_handler, 0, DRIVER_NAME, par);
if (ret)
goto err_release_pl_mem;

/* Initialize par */
da8xx_fb_info->var.bits_per_pixel = lcd_cfg->bpp;

Expand Down Expand Up @@ -1060,7 +1056,7 @@ static int __init fb_probe(struct platform_device *device)

ret = fb_alloc_cmap(&da8xx_fb_info->cmap, PALETTE_SIZE, 0);
if (ret)
goto err_free_irq;
goto err_release_pl_mem;
da8xx_fb_info->cmap.len = par->palette_sz;

/* initialize var_screeninfo */
Expand Down Expand Up @@ -1088,8 +1084,13 @@ static int __init fb_probe(struct platform_device *device)
goto err_cpu_freq;
}
#endif

ret = request_irq(par->irq, lcdc_irq_handler, 0, DRIVER_NAME, par);
if (ret)
goto irq_freq;
return 0;

irq_freq:
#ifdef CONFIG_CPU_FREQ
err_cpu_freq:
unregister_framebuffer(da8xx_fb_info);
Expand All @@ -1098,9 +1099,6 @@ static int __init fb_probe(struct platform_device *device)
err_dealloc_cmap:
fb_dealloc_cmap(&da8xx_fb_info->cmap);

err_free_irq:
free_irq(par->irq, par);

err_release_pl_mem:
dma_free_coherent(NULL, PALETTE_SIZE, par->v_palette_base,
par->p_palette_base);
Expand Down

0 comments on commit 93c176f

Please sign in to comment.