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-tv | |
| 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-tv')
| -rw-r--r-- | drivers/media/video/s5p-tv/mixer_grp_layer.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/s5p-tv/mixer_vp_layer.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/s5p-tv/mixer_grp_layer.c b/drivers/media/video/s5p-tv/mixer_grp_layer.c index 58f0ba49580f..de8270c2b6e7 100644 --- a/drivers/media/video/s5p-tv/mixer_grp_layer.c +++ b/drivers/media/video/s5p-tv/mixer_grp_layer.c @@ -86,7 +86,7 @@ static void mxr_graph_buffer_set(struct mxr_layer *layer, dma_addr_t addr = 0; if (buf) - addr = vb2_dma_contig_plane_paddr(&buf->vb, 0); + addr = vb2_dma_contig_plane_dma_addr(&buf->vb, 0); mxr_reg_graph_buffer(layer->mdev, layer->idx, addr); } diff --git a/drivers/media/video/s5p-tv/mixer_vp_layer.c b/drivers/media/video/s5p-tv/mixer_vp_layer.c index 6950ed8ac1a0..f3bb2e34cb51 100644 --- a/drivers/media/video/s5p-tv/mixer_vp_layer.c +++ b/drivers/media/video/s5p-tv/mixer_vp_layer.c @@ -97,9 +97,9 @@ static void mxr_vp_buffer_set(struct mxr_layer *layer, mxr_reg_vp_buffer(layer->mdev, luma_addr, chroma_addr); return; } - luma_addr[0] = vb2_dma_contig_plane_paddr(&buf->vb, 0); + luma_addr[0] = vb2_dma_contig_plane_dma_addr(&buf->vb, 0); if (layer->fmt->num_subframes == 2) { - chroma_addr[0] = vb2_dma_contig_plane_paddr(&buf->vb, 1); + chroma_addr[0] = vb2_dma_contig_plane_dma_addr(&buf->vb, 1); } else { /* FIXME: mxr_get_plane_size compute integer division, * which is slow and should not be performed in interrupt */ |