diff options
| author | Marek Szyprowski | 2011-08-29 08:20:56 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-09-06 20:05:10 +0200 |
| commit | ba7fcb0c954921534707f08ebc4d8beeb2eb17e7 (patch) | |
| tree | 0dc9929461e4ac2af79ab5bfffb1bdac181ad6c5 /drivers/media/video/s5p-mfc/s5p_mfc.c | |
| parent | [media] media: vb2: change plane sizes array to unsigned int[] (diff) | |
| download | kernel-qcow2-linux-ba7fcb0c954921534707f08ebc4d8beeb2eb17e7.tar.gz kernel-qcow2-linux-ba7fcb0c954921534707f08ebc4d8beeb2eb17e7.tar.xz kernel-qcow2-linux-ba7fcb0c954921534707f08ebc4d8beeb2eb17e7.zip | |
[media] media: vb2: dma contig allocator: use dma_addr instread of paddr
Use the correct 'dma_addr' name for the buffer address. 'paddr' suggested
that this is the physical address in system memory. For most ARM platforms
these two are the same, but this is not a generic rule. 'dma_addr' will
also point better to dma-mapping api.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Pawel Osciak <pawel@osciak.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-mfc/s5p_mfc.c')
| -rw-r--r-- | drivers/media/video/s5p-mfc/s5p_mfc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc.c b/drivers/media/video/s5p-mfc/s5p_mfc.c index 7dc7eab58b38..af32e020c527 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc.c +++ b/drivers/media/video/s5p-mfc/s5p_mfc.c @@ -202,7 +202,7 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx) appropraite flags */ src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); list_for_each_entry(dst_buf, &ctx->dst_queue, list) { - if (vb2_dma_contig_plane_paddr(dst_buf->b, 0) == dec_y_addr) { + if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) { memcpy(&dst_buf->b->v4l2_buf.timecode, &src_buf->b->v4l2_buf.timecode, sizeof(struct v4l2_timecode)); @@ -248,7 +248,7 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err) * check which videobuf does it correspond to */ list_for_each_entry(dst_buf, &ctx->dst_queue, list) { /* Check if this is the buffer we're looking for */ - if (vb2_dma_contig_plane_paddr(dst_buf->b, 0) == dspl_y_addr) { + if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dspl_y_addr) { list_del(&dst_buf->list); ctx->dst_queue_cnt--; dst_buf->b->v4l2_buf.sequence = ctx->sequence; |