git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d108be
)
OMAPFB: don't mark framebuffer as IO memory
author
Grazvydas Ignotas
<notasas@gmail.com>
Sat, 7 Feb 2015 21:56:50 +0000
(23:56 +0200)
committer
Grazvydas Ignotas
<notasas@gmail.com>
Fri, 20 Feb 2015 22:05:27 +0000
(
00:05
+0200)
because it isn't
drivers/video/omap2/omapfb/omapfb-main.c
patch
|
blob
|
history
diff --git
a/drivers/video/omap2/omapfb/omapfb-main.c
b/drivers/video/omap2/omapfb/omapfb-main.c
index
55a67c4
..
46a2c11
100644
(file)
--- a/
drivers/video/omap2/omapfb/omapfb-main.c
+++ b/
drivers/video/omap2/omapfb/omapfb-main.c
@@
-1126,13
+1126,16
@@
static int omapfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
vma->vm_ops = &mmap_user_ops;
vma->vm_private_data = rg;
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
vma->vm_ops = &mmap_user_ops;
vma->vm_private_data = rg;
- if (
io_
remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
-
vma->vm_end - vma->vm_start,
-
vma->vm_page_prot)) {
+ if (remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+ vma->vm_end - vma->vm_start,
+ vma->vm_page_prot)) {
r = -EAGAIN;
goto error;
}
r = -EAGAIN;
goto error;
}
+ /* not IO memory */
+ vma->vm_flags &= ~VM_IO;
+
/* vm_ops.open won't be called for mmap itself. */
atomic_inc(&rg->map_count);
/* vm_ops.open won't be called for mmap itself. */
atomic_inc(&rg->map_count);