From 3835f38b280f82db26989a8eda20ae601c3d7e83 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 18 Apr 2013 07:52:42 +0300 Subject: [PATCH] --- yaml --- r: 362953 b: refs/heads/master c: 11bd5933abe033fb7a3a0d1f1bd2cb4b6df8143f h: refs/heads/master i: 362951: cd49bf699ea1c39ca2e0cca3b429a5e5067e3686 v: v3 --- [refs] | 2 +- trunk/drivers/video/ps3fb.c | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index d6ba4133314f..cd642397330c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c84deb9d615c02993ce0972a0b34585c7624822f +refs/heads/master: 11bd5933abe033fb7a3a0d1f1bd2cb4b6df8143f diff --git a/trunk/drivers/video/ps3fb.c b/trunk/drivers/video/ps3fb.c index 920c27bf3947..d9f08c653d62 100644 --- a/trunk/drivers/video/ps3fb.c +++ b/trunk/drivers/video/ps3fb.c @@ -705,21 +705,15 @@ static int ps3fb_pan_display(struct fb_var_screeninfo *var, static int ps3fb_mmap(struct fb_info *info, struct vm_area_struct *vma) { - unsigned long size, offset; + int r; - size = vma->vm_end - vma->vm_start; - offset = vma->vm_pgoff << PAGE_SHIFT; - if (offset + size > info->fix.smem_len) - return -EINVAL; - - offset += info->fix.smem_start; - if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT, - size, vma->vm_page_prot)) - return -EAGAIN; + r = vm_iomap_memory(vma, info->fix.smem_start, info->fix.smem_len); dev_dbg(info->device, "ps3fb: mmap framebuffer P(%lx)->V(%lx)\n", - offset, vma->vm_start); - return 0; + info->fix.smem_start + vma->vm_pgoff << PAGE_SHIFT, + vma->vm_start); + + return r; } /*