Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59bd00c8 authored by Thomas Chou's avatar Thomas Chou Committed by Mike Frysinger
Browse files

Blackfin: fix framebuffer mmap bug for nommu 



The patch added a special get_unmapped_area for framebuffer which
was hooked to the file ops in drivers/video/fbmem.c.

This is needed since v2.6.29-rc1 where nommu vma management was
updated, and mmap of framebuffer caused kernel BUG panic. You may turn
on "Debug the global anon/private NOMMU mapping region tree" config to
such message.

As Documentation/nommu-mmap.txt said,
"To provide shareable character device support, a driver must provide
a file->f_op->get_unmapped_area() operation. The mmap() routines will
call this to get a proposed address for the mapping."

With this change, user space should call mmap for framebuffer using
shared map. Or it can try shared map first, then private map if
failed. This shared map usage is now consistent between mmu and nommu.

The sys_ file may not be a good place for this patch. But there is a
similar one for sparc. I tested a similar patch on nios2nommu, though
I don't have a blackfin board to test.

Signed-off-by: default avatarThomas Chou <thomas@wytron.com.tw>
Signed-off-by: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 4a7bcb4f

arch/blackfin/include/asm/pgtable.h

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ extern unsigned int kobjsize(const void *objp); 
#define	VMALLOC_START	0

#define	VMALLOC_END	0xffffffff



/* provide a special get_unmapped_area for framebuffer mmaps of nommu */

extern unsigned long get_fb_unmapped_area(struct file *filp, unsigned long,

					  unsigned long, unsigned long,

					  unsigned long);

#define HAVE_ARCH_FB_UNMAPPED_AREA



#include <asm-generic/pgtable.h>



#endif				/* _BLACKFIN_PGTABLE_H */

arch/blackfin/kernel/sys_bfin.c

+11 −0
Original line number Diff line number Diff line
@@ -69,3 +69,14 @@ asmlinkage void *sys_dma_memcpy(void *dest, const void *src, size_t len) 
{

	return safe_dma_memcpy(dest, src, len);

}



#if defined(CONFIG_FB) || defined(CONFIG_FB_MODULE)

#include <linux/fb.h>

unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr,

	unsigned long len, unsigned long pgoff, unsigned long flags)

{

	struct fb_info *info = filp->private_data;

	return (unsigned long)info->screen_base;

}

EXPORT_SYMBOL(get_fb_unmapped_area);

#endif