From 0f83814ef2d13be836c3b7453d033d691777a15d Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 3 Dec 2009 10:31:56 -0500 Subject: [PATCH] --- yaml --- r: 174412 b: refs/heads/master c: 7164bb4393cef668d3da281fa1c599a6673ea768 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/fb_defio.c | 4 +++- trunk/include/linux/fb.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8c4160d2a07e..6f6218eeea38 100644 --- 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 index 0a7a6679ee6e..875d019bb2a4 100644 --- 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 index f847df9e99b6..6e8ebf7e6523 100644 --- 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 */