mirror of
https://github.com/tbsdtv/media_build.git
synced 2025-07-23 04:13:02 +02:00
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
|
|
index 748131151c49..f6db8bfb6573 100644
|
|
--- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
|
|
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
|
|
@@ -302,7 +302,8 @@ static void *vb2_dma_sg_vaddr(void *buf_priv)
|
|
if (buf->db_attach)
|
|
buf->vaddr = dma_buf_vmap(buf->db_attach->dmabuf);
|
|
else
|
|
- buf->vaddr = vm_map_ram(buf->pages, buf->num_pages, -1);
|
|
+ buf->vaddr = vm_map_ram(buf->pages,
|
|
+ buf->num_pages, -1, PAGE_KERNEL);
|
|
}
|
|
|
|
/* add offset in case userptr is not page-aligned */
|
|
diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
index bf5ac63a5742..66276a8d50b5 100644
|
|
--- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
+++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
|
|
@@ -107,7 +107,8 @@ static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr,
|
|
buf->vaddr = (__force void *)
|
|
ioremap(__pfn_to_phys(nums[0]), size + offset);
|
|
} else {
|
|
- buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1);
|
|
+ buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1,
|
|
+ PAGE_KERNEL);
|
|
}
|
|
|
|
if (!buf->vaddr)
|