diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2011-08-29 02:20:56 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-06 14:05:10 -0400 |
commit | ba7fcb0c954921534707f08ebc4d8beeb2eb17e7 (patch) | |
tree | 0dc9929461e4ac2af79ab5bfffb1bdac181ad6c5 /drivers/media/video/s5p-mfc/s5p_mfc.c | |
parent | 035aa1475d6e4afdf97dccf6c6d6059063398b57 (diff) |
[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) | |||
202 | appropraite flags */ | 202 | appropraite flags */ |
203 | src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); | 203 | src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); |
204 | list_for_each_entry(dst_buf, &ctx->dst_queue, list) { | 204 | list_for_each_entry(dst_buf, &ctx->dst_queue, list) { |
205 | if (vb2_dma_contig_plane_paddr(dst_buf->b, 0) == dec_y_addr) { | 205 | if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) { |
206 | memcpy(&dst_buf->b->v4l2_buf.timecode, | 206 | memcpy(&dst_buf->b->v4l2_buf.timecode, |
207 | &src_buf->b->v4l2_buf.timecode, | 207 | &src_buf->b->v4l2_buf.timecode, |
208 | sizeof(struct v4l2_timecode)); | 208 | sizeof(struct v4l2_timecode)); |
@@ -248,7 +248,7 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err) | |||
248 | * check which videobuf does it correspond to */ | 248 | * check which videobuf does it correspond to */ |
249 | list_for_each_entry(dst_buf, &ctx->dst_queue, list) { | 249 | list_for_each_entry(dst_buf, &ctx->dst_queue, list) { |
250 | /* Check if this is the buffer we're looking for */ | 250 | /* Check if this is the buffer we're looking for */ |
251 | if (vb2_dma_contig_plane_paddr(dst_buf->b, 0) == dspl_y_addr) { | 251 | if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dspl_y_addr) { |
252 | list_del(&dst_buf->list); | 252 | list_del(&dst_buf->list); |
253 | ctx->dst_queue_cnt--; | 253 | ctx->dst_queue_cnt--; |
254 | dst_buf->b->v4l2_buf.sequence = ctx->sequence; | 254 | dst_buf->b->v4l2_buf.sequence = ctx->sequence; |