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: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index a9806ba6116dec553be8f06141b5e6d314a8996c..f1178f6f434d0f76d419845d8789d87095ed355a 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -434,8 +434,10 @@ static void vb2_dc_put_userptr(void *buf_priv)
                pages = frame_vector_pages(buf->vec);
                /* sgt should exist only if vector contains pages... */
                BUG_ON(IS_ERR(pages));
-               for (i = 0; i < frame_vector_count(buf->vec); i++)
-                       set_page_dirty_lock(pages[i]);
+               if (buf->dma_dir == DMA_FROM_DEVICE ||
+                   buf->dma_dir == DMA_BIDIRECTIONAL)
+                       for (i = 0; i < frame_vector_count(buf->vec); i++)
+                               set_page_dirty_lock(pages[i]);
                sg_free_table(sgt);
                kfree(sgt);
        }

diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index 6808231a6bdc28f7fcf7dbd0f3fde98d5084ee26..753ed3138dcc8bd77bacda888fa09ed849e09f69 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -292,11 +292,10 @@ static void vb2_dma_sg_put_userptr(void *buf_priv)
        if (buf->vaddr)
                vm_unmap_ram(buf->vaddr, buf->num_pages);
        sg_free_table(buf->dma_sgt);
-       while (--i >= 0) {
-               if (buf->dma_dir == DMA_FROM_DEVICE ||
-                   buf->dma_dir == DMA_BIDIRECTIONAL)
+       if (buf->dma_dir == DMA_FROM_DEVICE ||
+           buf->dma_dir == DMA_BIDIRECTIONAL)
+               while (--i >= 0)
                        set_page_dirty_lock(buf->pages[i]);
-       }
        vb2_destroy_framevec(buf->vec);
        kfree(buf);
 }