* [PATCH] gma500: Fix mmap frambuffer
@ 2012-03-15 14:50 Alan Cox
0 siblings, 0 replies; 4+ messages in thread
From: Alan Cox @ 2012-03-15 14:50 UTC (permalink / raw)
To: airlied, dri-devel
From: Yoichi Yuasa <yuasa@linux-mips.org>
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
---
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 8fde0d9..b51b9b8 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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] gma500: Fix mmap frambuffer
@ 2012-03-15 12:28 ` Yoichi Yuasa
0 siblings, 0 replies; 4+ messages in thread
From: Yoichi Yuasa @ 2012-03-15 12:28 UTC (permalink / raw)
To: alan; +Cc: yuasa, linux-kernel, linux-fbdev
It cannot map correctly if page fault begins from a intermediate address.
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
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 be61673..5154493 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -158,7 +158,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);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] gma500: Fix mmap frambuffer
@ 2012-03-15 12:28 ` Yoichi Yuasa
0 siblings, 0 replies; 4+ messages in thread
From: Yoichi Yuasa @ 2012-03-15 12:28 UTC (permalink / raw)
To: alan; +Cc: yuasa, linux-kernel, linux-fbdev
It cannot map correctly if page fault begins from a intermediate address.
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
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 be61673..5154493 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -158,7 +158,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);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gma500: Fix mmap frambuffer
2012-03-15 12:28 ` Yoichi Yuasa
(?)
@ 2012-03-15 14:47 ` Alan Cox
-1 siblings, 0 replies; 4+ messages in thread
From: Alan Cox @ 2012-03-15 14:47 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: linux-kernel, linux-fbdev
On Thu, 15 Mar 2012 21:28:16 +0900
Yoichi Yuasa <yuasa@linux-mips.org> wrote:
>
> It cannot map correctly if page fault begins from a intermediate
> address.
Thanks, that explains one very strange bug I've been seeing !
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-15 14:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-15 14:50 [PATCH] gma500: Fix mmap frambuffer Alan Cox
-- strict thread matches above, loose matches on Subject: below --
2012-03-15 12:28 Yoichi Yuasa
2012-03-15 12:28 ` Yoichi Yuasa
2012-03-15 14:47 ` Alan Cox
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.