From: Yoichi Yuasa Date: Thu, 15 Mar 2012 14:50:16 +0000 (+0000) Subject: gma500: Fix mmap frambuffer X-Git-Tag: upstream/snapshot3+hdmi~7918^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1278f7de7fa5606ed513a5271f7fb63910ef1b8b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git gma500: Fix mmap frambuffer It cannot map correctly if page fault begins from a intermediate address. [The driver prefaults the mapping, so we need to work from the correct base address not the faulting address otherwise the map appears offset by the fault offset] Signed-off-by: Yoichi Yuasa Signed-off-by: Alan Cox Cc: stable@kernel.org Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index 153f9cf..8ea202f 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -125,7 +125,7 @@ static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) unsigned long phys_addr = (unsigned long)dev_priv->stolen_base; page_num = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - address = (unsigned long)vmf->virtual_address; + address = (unsigned long)vmf->virtual_address - (vmf->pgoff << PAGE_SHIFT); vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);