Commit c0cb7658 authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab

media: vb2: unify calling of set_page_dirty_lock

Currently videobuf2-dma-sg checks for dma direction for
every single page and videobuf2-dc lacks any dma direction
checks and calls set_page_dirty_lock unconditionally.

Thus unify and align the invocations of set_page_dirty_lock
for videobuf2-dc, videobuf2-sg  memory allocators with
videobuf2-vmalloc, i.e. the pattern used in vmalloc has been
copied to dc and dma-sg.
Suggested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent c4b72ee8
...@@ -434,6 +434,8 @@ static void vb2_dc_put_userptr(void *buf_priv) ...@@ -434,6 +434,8 @@ static void vb2_dc_put_userptr(void *buf_priv)
pages = frame_vector_pages(buf->vec); pages = frame_vector_pages(buf->vec);
/* sgt should exist only if vector contains pages... */ /* sgt should exist only if vector contains pages... */
BUG_ON(IS_ERR(pages)); BUG_ON(IS_ERR(pages));
if (buf->dma_dir == DMA_FROM_DEVICE ||
buf->dma_dir == DMA_BIDIRECTIONAL)
for (i = 0; i < frame_vector_count(buf->vec); i++) for (i = 0; i < frame_vector_count(buf->vec); i++)
set_page_dirty_lock(pages[i]); set_page_dirty_lock(pages[i]);
sg_free_table(sgt); sg_free_table(sgt);
......
...@@ -292,11 +292,10 @@ static void vb2_dma_sg_put_userptr(void *buf_priv) ...@@ -292,11 +292,10 @@ static void vb2_dma_sg_put_userptr(void *buf_priv)
if (buf->vaddr) if (buf->vaddr)
vm_unmap_ram(buf->vaddr, buf->num_pages); vm_unmap_ram(buf->vaddr, buf->num_pages);
sg_free_table(buf->dma_sgt); sg_free_table(buf->dma_sgt);
while (--i >= 0) {
if (buf->dma_dir == DMA_FROM_DEVICE || if (buf->dma_dir == DMA_FROM_DEVICE ||
buf->dma_dir == DMA_BIDIRECTIONAL) buf->dma_dir == DMA_BIDIRECTIONAL)
while (--i >= 0)
set_page_dirty_lock(buf->pages[i]); set_page_dirty_lock(buf->pages[i]);
}
vb2_destroy_framevec(buf->vec); vb2_destroy_framevec(buf->vec);
kfree(buf); kfree(buf);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment