public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH]videobuf_dma_sg: a new implementation for mmap
@ 2010-07-27 12:21 Figo.zhang
  2010-07-28  9:13 ` Laurent Pinchart
  2010-07-28 12:57 ` [PATCH v2]videobuf_dma_sg: " Figo.zhang
  0 siblings, 2 replies; 7+ messages in thread
From: Figo.zhang @ 2010-07-27 12:21 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Mauro Carvalho Chehab
  Cc: linux-media, Laurent Pinchart


a mmap issue for videobuf-dma-sg: it will alloc a new page for mmaping
when it encounter page fault at video_vm_ops->fault().

a new implementation for mmap, it translate the vmalloc to page at
video_vm_ops->fault().

Signed-off-by: Figo.zhang <figo1802@gmail.com>
---
drivers/media/video/videobuf-dma-sg.c |   38
++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/drivers/media/video/videobuf-dma-sg.c
b/drivers/media/video/videobuf-dma-sg.c
index 8359e6b..c9a8817 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -397,16 +397,44 @@ static void videobuf_vm_close(struct
vm_area_struct *vma)
  */
 static int videobuf_vm_fault(struct vm_area_struct *vma, struct
vm_fault *vmf)
 {
-	struct page *page;
+	struct page *page = NULL;
+	struct videobuf_mapping *map = vma->vm_private_data;
+	struct videobuf_queue *q = map->q;
+	struct videobuf_dma_sg_memory *mem = NULL;
+
+	unsigned long offset;
+	unsigned long page_nr;
+	int first;
 
 	dprintk(3, "fault: fault @ %08lx [vma %08lx-%08lx]\n",
 		(unsigned long)vmf->virtual_address,
 		vma->vm_start, vma->vm_end);
 
-	page = alloc_page(GFP_USER | __GFP_DMA32);
-	if (!page)
-		return VM_FAULT_OOM;
-	clear_user_highpage(page, (unsigned long)vmf->virtual_address);
+	mutex_lock(&q->vb_lock);
+
+	offset = (unsigned long)vmf->virtual_address - vma->vm_start;
+	page_nr = offset >> PAGE_SHIFT;
+
+	for (first = 0; first < VIDEO_MAX_FRAME; first++) {
+			if (NULL == q->bufs[first])
+				continue;
+
+			MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);
+
+			if (q->bufs[first]->map == map)
+				break;
+	}
+
+	mem = q->bufs[first]->priv;
+	if (!mem)
+		return VM_FAULT_SIGBUS;
+	if (mem->dma.vmalloc)
+		page = vmalloc_to_page(mem->dma.vmalloc+
+				(offset & (~PAGE_MASK)));
+	if (mem->dma.pages)
+		page = mem->dma.pages[page_nr];
+	mutex_unlock(&q->vb_lock);
+
 	vmf->page = page;
 
 	return 0;



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2010-07-29 17:00 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-27 12:21 [PATCH]videobuf_dma_sg: a new implementation for mmap Figo.zhang
2010-07-28  9:13 ` Laurent Pinchart
2010-07-28 12:57 ` [PATCH v2]videobuf_dma_sg: " Figo.zhang
2010-07-28 13:08   ` Figo.zhang
2010-07-29 13:38     ` Figo.zhang
2010-07-29 16:41       ` Mauro Carvalho Chehab
2010-07-29 17:00     ` Laurent Pinchart

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox