AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-26 09:30:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns()

Browse Source 
Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns() instead of
hand made mapping of virtual address to physical address. Also the
function leaked page reference from get_user_pages() so fix that by
properly release the reference when omap_vout_buffer_release() is
called.

Signed-off-by: Jan Kara <jack@suse.cz>
[hans.verkuil@cisco.com: remove unused variable]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Jan Kara 2015-07-13 11:55:45 -03:00 committed by Mauro Carvalho Chehab
parent 8025e5ddf9
commit 8a677b6edd
2 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/platform/omap/Kconfig
View File

@ -10,6 +10,7 @@ config VIDEO_OMAP2_VOUT
select OMAP2_DSS if HAS_IOMEM && ARCH_OMAP2PLUS
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select VIDEO_OMAP2_VOUT_VRFB if VIDEO_OMAP2_VOUT && OMAP2_VRFB
select FRAME_VECTOR
default n
---help---
V4L2 Display driver support for OMAP2/3 based boards.

73
drivers/media/platform/omap/omap_vout.c
View File

@ -195,46 +195,34 @@ static int omap_vout_try_format(struct v4l2_pix_format *pix)
}
/*
* omap_vout_uservirt_to_phys: This inline function is used to convert user
* space virtual address to physical address.
* omap_vout_get_userptr: Convert user space virtual address to physical
* address.
*/
static unsigned long omap_vout_uservirt_to_phys(unsigned long virtp)
static int omap_vout_get_userptr(struct videobuf_buffer *vb, u32 virtp,
u32 *physp)
{
unsigned long physp = 0;
struct vm_area_struct *vma;
struct mm_struct *mm = current->mm;
struct frame_vector *vec;
int ret;
/* For kernel direct-mapped memory, take the easy way */
if (virtp >= PAGE_OFFSET)
return virt_to_phys((void *) virtp);
down_read(&current->mm->mmap_sem);
vma = find_vma(mm, virtp);
if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) {
/* this will catch, kernel-allocated, mmaped-to-usermode
addresses */
physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start);
up_read(&current->mm->mmap_sem);
} else {
/* otherwise, use get_user_pages() for general userland pages */
int res, nr_pages = 1;
struct page *pages;
res = get_user_pages(current, current->mm, virtp, nr_pages, 1,
0, &pages, NULL);
up_read(&current->mm->mmap_sem);
if (res == nr_pages) {
physp = __pa(page_address(&pages[0]) +
(virtp & ~PAGE_MASK));
} else {
printk(KERN_WARNING VOUT_NAME
"get_user_pages failed\n");
return 0;
}
if (virtp >= PAGE_OFFSET) {
*physp = virt_to_phys((void *)virtp);
return 0;
}
return physp;
vec = frame_vector_create(1);
if (!vec)
return -ENOMEM;
ret = get_vaddr_frames(virtp, 1, true, false, vec);
if (ret != 1) {
frame_vector_destroy(vec);
return -EINVAL;
}
*physp = __pfn_to_phys(frame_vector_pfns(vec)[0]);
vb->priv = vec;
return 0;
}
/*
@ -784,11 +772,15 @@ static int omap_vout_buffer_prepare(struct videobuf_queue *q,
* address of the buffer
*/
if (V4L2_MEMORY_USERPTR == vb->memory) {
int ret;
if (0 == vb->baddr)
return -EINVAL;
/* Physical address */
vout->queued_buf_addr[vb->i] = (u8 *)
omap_vout_uservirt_to_phys(vb->baddr);
ret = omap_vout_get_userptr(vb, vb->baddr,
(u32 *)&vout->queued_buf_addr[vb->i]);
if (ret < 0)
return ret;
} else {
unsigned long addr, dma_addr;
unsigned long size;
@ -834,12 +826,13 @@ static void omap_vout_buffer_queue(struct videobuf_queue *q,
static void omap_vout_buffer_release(struct videobuf_queue *q,
struct videobuf_buffer *vb)
{
struct omap_vout_device *vout = q->priv_data;
vb->state = VIDEOBUF_NEEDS_INIT;
if (vb->memory == V4L2_MEMORY_USERPTR && vb->priv) {
struct frame_vector *vec = vb->priv;
if (V4L2_MEMORY_MMAP != vout->memory)
return;
put_vaddr_frames(vec);
frame_vector_destroy(vec);
}
}
/*