---

yaml --- r: 174412 b: refs/heads/master c: 7164bb4 h: refs/heads/master v: v3
git-mirror · Dec 4, 2009 · 0f83814 · 0f83814
1 parent 89afaf0
commit 0f83814
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba69ea42f8ba8286cbe0e939bd1ce781b7905b84
+refs/heads/master: 7164bb4393cef668d3da281fa1c599a6673ea768
diff --git a/trunk/drivers/video/fb_defio.c b/trunk/drivers/video/fb_defio.c
@@ -144,7 +144,9 @@ static const struct address_space_operations fb_deferred_io_aops = {
 static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
 	vma->vm_ops = &fb_deferred_io_vm_ops;
-	vma->vm_flags |= ( VM_IO | VM_RESERVED | VM_DONTEXPAND );
+	vma->vm_flags |= ( VM_RESERVED | VM_DONTEXPAND );
+	if (!(info->flags & FBINFO_VIRTFB))
+		vma->vm_flags |= VM_IO;
 	vma->vm_private_data = info;
 	return 0;
 }

diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h
@@ -768,6 +768,7 @@ struct fb_tile_ops {
 	 *  takes over; acceleration engine should be in a quiescent state */
 
 /* hints */
+#define FBINFO_VIRTFB		0x0004 /* FB is System RAM, not device. */
 #define FBINFO_PARTIAL_PAN_OK	0x0040 /* otw use pan only for double-buffering */
 #define FBINFO_READS_FAST	0x0080 /* soft-copy faster than rendering */