From cd49bf699ea1c39ca2e0cca3b429a5e5067e3686 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 18 Apr 2013 07:47:47 +0300 Subject: [PATCH] --- yaml --- r: 362951 b: refs/heads/master c: 5171774382959f9a42ecd36bf408f6979effcb6a h: refs/heads/master i: 362949: e436dfc846db9a5fd7d65289e78eb3ec6ecb53e0 362947: 1490560b21bc6b253789ca600a42cafbd9435f22 362943: 9377ea267d01a8683c19916e9aa3f5e4210c74fd v: v3 --- [refs] | 2 +- trunk/drivers/video/vermilion/vermilion.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 7de2120ce45b..8cb4fa70be64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51fc8e8aabf1dc89934743c62069acbbe2016fe9 +refs/heads/master: 5171774382959f9a42ecd36bf408f6979effcb6a diff --git a/trunk/drivers/video/vermilion/vermilion.c b/trunk/drivers/video/vermilion/vermilion.c index 0aa516fc59cd..09a136633f35 100644 --- a/trunk/drivers/video/vermilion/vermilion.c +++ b/trunk/drivers/video/vermilion/vermilion.c @@ -1003,24 +1003,18 @@ static int vmlfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, static int vmlfb_mmap(struct fb_info *info, struct vm_area_struct *vma) { struct vml_info *vinfo = container_of(info, struct vml_info, info); - unsigned long size = vma->vm_end - vma->vm_start; unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; int ret; - if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) - return -EINVAL; - if (offset + size > vinfo->vram_contig_size) - return -EINVAL; ret = vmlfb_vram_offset(vinfo, offset); if (ret) return -EINVAL; - offset += vinfo->vram_start; + pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT; - if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT, - size, vma->vm_page_prot)) - return -EAGAIN; - return 0; + + return vm_iomap_memory(vma, vinfo->vram_start, + vinfo->vram_contig_size); } static int vmlfb_sync(struct fb_info *info)