mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-21 03:43:03 +00:00
fbdev: move arch-specific bits to their respective subdirectories
Move arch-specific bits of fb_mmap() to their respective subdirectories [bob.picco@hp.com: efi_range_is_wc is referenced but not declared] [bunk@stusta.de: fix include/asm-m68k/fb.h] Signed-off-by: Antonino Daplas <adaplas@gmail.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Antonino A. Daplas
Linus Torvalds
parent
0c6c1ce079
commit
10eb2659cc
|
|
@ -33,18 +33,11 @@
|
|||
#include <linux/err.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/efi.h>
|
||||
|
||||
#if defined(__mc68000__) || defined(CONFIG_APUS)
|
||||
#include <asm/setup.h>
|
||||
#endif
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/pgtable.h>
|
||||
|
||||
#include <linux/fb.h>
|
||||
|
||||
#include <asm/fb.h>
|
||||
|
||||
|
||||
/*
|
||||
* Frame buffer device initialization and setup routines
|
||||
*/
|
||||
|
|
@ -1155,17 +1148,15 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|||
}
|
||||
#endif
|
||||
|
||||
static int
|
||||
static int
|
||||
fb_mmap(struct file *file, struct vm_area_struct * vma)
|
||||
{
|
||||
int fbidx = iminor(file->f_path.dentry->d_inode);
|
||||
struct fb_info *info = registered_fb[fbidx];
|
||||
struct fb_ops *fb = info->fbops;
|
||||
unsigned long off;
|
||||
#if !defined(__sparc__) || defined(__sparc_v9__)
|
||||
unsigned long start;
|
||||
u32 len;
|
||||
#endif
|
||||
|
||||
if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
|
||||
return -EINVAL;
|
||||
|
|
@ -1180,12 +1171,6 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
|
|||
return res;
|
||||
}
|
||||
|
||||
#if defined(__sparc__) && !defined(__sparc_v9__)
|
||||
/* Should never get here, all fb drivers should have their own
|
||||
mmap routines */
|
||||
return -EINVAL;
|
||||
#else
|
||||
/* !sparc32... */
|
||||
lock_kernel();
|
||||
|
||||
/* frame buffer memory */
|
||||
|
|
@ -1209,50 +1194,11 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
|
|||
vma->vm_pgoff = off >> PAGE_SHIFT;
|
||||
/* This is an IO map - tell maydump to skip this VMA */
|
||||
vma->vm_flags |= VM_IO | VM_RESERVED;
|
||||
#if defined(__mc68000__)
|
||||
#if defined(CONFIG_SUN3)
|
||||
pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
|
||||
#elif defined(CONFIG_MMU)
|
||||
if (CPU_IS_020_OR_030)
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
|
||||
if (CPU_IS_040_OR_060) {
|
||||
pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
|
||||
/* Use no-cache mode, serialized */
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
|
||||
}
|
||||
#endif
|
||||
#elif defined(__powerpc__)
|
||||
vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT,
|
||||
vma->vm_end - vma->vm_start,
|
||||
vma->vm_page_prot);
|
||||
#elif defined(__alpha__)
|
||||
/* Caching is off in the I/O space quadrant by design. */
|
||||
#elif defined(__i386__) || defined(__x86_64__)
|
||||
if (boot_cpu_data.x86 > 3)
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
|
||||
#elif defined(__mips__) || defined(__sparc_v9__)
|
||||
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
||||
#elif defined(__hppa__)
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
|
||||
#elif defined(__arm__) || defined(__sh__) || defined(__m32r__)
|
||||
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
||||
#elif defined(__avr32__)
|
||||
vma->vm_page_prot = __pgprot((pgprot_val(vma->vm_page_prot)
|
||||
& ~_PAGE_CACHABLE)
|
||||
| (_PAGE_BUFFER | _PAGE_DIRTY));
|
||||
#elif defined(__ia64__)
|
||||
if (efi_range_is_wc(vma->vm_start, vma->vm_end - vma->vm_start))
|
||||
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
||||
else
|
||||
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
||||
#else
|
||||
#warning What do we have to do here??
|
||||
#endif
|
||||
fb_pgprotect(file, vma, off);
|
||||
if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
|
||||
vma->vm_end - vma->vm_start, vma->vm_page_prot))
|
||||
return -EAGAIN;
|
||||
return 0;
|
||||
#endif /* !sparc32 */
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
|||
7
include/asm-alpha/fb.h
Normal file
7
include/asm-alpha/fb.h
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
/* Caching is off in the I/O space quadrant by design. */
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
13
include/asm-arm/fb.h
Normal file
13
include/asm-arm/fb.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-arm26/fb.h
Normal file
6
include/asm-arm26/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
15
include/asm-avr32/fb.h
Normal file
15
include/asm-avr32/fb.h
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
vma->vm_page_prot = __pgprot((pgprot_val(vma->vm_page_prot)
|
||||
& ~_PAGE_CACHABLE)
|
||||
| (_PAGE_BUFFER | _PAGE_DIRTY));
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-blackfin/fb.h
Normal file
6
include/asm-blackfin/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-cris/fb.h
Normal file
6
include/asm-cris/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-frv/fb.h
Normal file
6
include/asm-frv/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-h8300/fb.h
Normal file
6
include/asm-h8300/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
14
include/asm-i386/fb.h
Normal file
14
include/asm-i386/fb.h
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
if (boot_cpu_data.x86 > 3)
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
17
include/asm-ia64/fb.h
Normal file
17
include/asm-ia64/fb.h
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <linux/efi.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
if (efi_range_is_wc(vma->vm_start, vma->vm_end - vma->vm_start))
|
||||
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
||||
else
|
||||
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
13
include/asm-m32r/fb.h
Normal file
13
include/asm-m32r/fb.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
28
include/asm-m68k/fb.h
Normal file
28
include/asm-m68k/fb.h
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/setup.h>
|
||||
|
||||
#ifdef CONFIG_SUN3
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
|
||||
}
|
||||
#else
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
if (CPU_IS_020_OR_030)
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
|
||||
if (CPU_IS_040_OR_060) {
|
||||
pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
|
||||
/* Use no-cache mode, serialized */
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_SUN3 */
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-m68knommu/fb.h
Normal file
6
include/asm-m68knommu/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
13
include/asm-mips/fb.h
Normal file
13
include/asm-mips/fb.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
13
include/asm-parisc/fb.h
Normal file
13
include/asm-parisc/fb.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
15
include/asm-powerpc/fb.h
Normal file
15
include/asm-powerpc/fb.h
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT,
|
||||
vma->vm_end - vma->vm_start,
|
||||
vma->vm_page_prot);
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-s390/fb.h
Normal file
6
include/asm-s390/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
13
include/asm-sh/fb.h
Normal file
13
include/asm-sh/fb.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
13
include/asm-sh64/fb.h
Normal file
13
include/asm-sh64/fb.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-sparc/fb.h
Normal file
6
include/asm-sparc/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
12
include/asm-sparc64/fb.h
Normal file
12
include/asm-sparc64/fb.h
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-v850/fb.h
Normal file
6
include/asm-v850/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
14
include/asm-x86_64/fb.h
Normal file
14
include/asm-x86_64/fb.h
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
|
||||
unsigned long off)
|
||||
{
|
||||
if (boot_cpu_data.x86 > 3)
|
||||
pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
|
||||
}
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
6
include/asm-xtensa/fb.h
Normal file
6
include/asm-xtensa/fb.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _ASM_FB_H_
|
||||
#define _ASM_FB_H_
|
||||
|
||||
#define fb_pgprotect(...) do {} while (0)
|
||||
|
||||
#endif /* _ASM_FB_H_ */
|
||||
Loading…
Reference in a new issue