diff options
| author | Yoichi Yuasa <yuasa@linux-mips.org> | 2012-03-15 15:50:16 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-20 10:31:12 +0100 |
| commit | 1278f7de7fa5606ed513a5271f7fb63910ef1b8b (patch) | |
| tree | ee01b54e28f8d34cf048a2b074e0210abb0a9f85 /drivers/gpu | |
| parent | Merge tag 'drm-intel-next-2012-03-01' of git://people.freedesktop.org/~danvet... (diff) | |
| download | linux-1278f7de7fa5606ed513a5271f7fb63910ef1b8b.tar.xz linux-1278f7de7fa5606ed513a5271f7fb63910ef1b8b.zip | |
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 <yuasa@linux-mips.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/gma500/framebuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index 153f9cf2446d..8ea202f1ba50 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); |