1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-27 09:49:52 +02:00
openwrt-xburst/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch
jogo 87cb2a5585 linux: update 3.1 to 3.1.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29470 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-12-06 19:50:30 +00:00

42 lines
1.1 KiB
Diff

--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -419,10 +419,10 @@ static void set_fb_fix(struct fb_info *f
fbi->screen_base = rg->vaddr;
if (!from_init) {
- mutex_lock(&fbi->mm_lock);
+ preempt_disable();
fix->smem_start = rg->paddr;
fix->smem_len = rg->size;
- mutex_unlock(&fbi->mm_lock);
+ preempt_enable();
} else {
fix->smem_start = rg->paddr;
fix->smem_len = rg->size;
@@ -932,10 +932,10 @@ static int omapfb_setup_mem(struct fb_in
* plane memory is dealloce'd, the other
* screen parameters in var / fix are invalid.
*/
- mutex_lock(&fbi->mm_lock);
+ preempt_disable();
fbi->fix.smem_start = 0;
fbi->fix.smem_len = 0;
- mutex_unlock(&fbi->mm_lock);
+ preempt_enable();
}
}
}
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1369,8 +1369,10 @@ fb_mmap(struct file *file, struct vm_are
}
/* frame buffer memory */
+ preempt_disable();
start = info->fix.smem_start;
len = PAGE_ALIGN((start & ~PAGE_MASK) + info->fix.smem_len);
+ preempt_enable();
if (off >= len) {
/* memory mapped io */
off -= len;