Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba7fcb0c authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
CC: Pawel Osciak <pawel@osciak.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 035aa147

drivers/media/video/atmel-isi.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static int buffer_prepare(struct vb2_buffer *vb) 


			/* Initialize the dma descriptor */

			desc->p_fbd->fb_address =

					vb2_dma_contig_plane_paddr(vb, 0);

					vb2_dma_contig_plane_dma_addr(vb, 0);

			desc->p_fbd->next_fbd_address = 0;

			set_dma_ctrl(desc->p_fbd, ISI_DMA_CTRL_WB);

drivers/media/video/marvell-ccic/mcam-core.c

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static void mcam_set_contig_buffer(struct mcam_camera *cam, int frame) 
		buf = cam->vb_bufs[frame ^ 0x1];

		cam->vb_bufs[frame] = buf;

		mcam_reg_write(cam, frame == 0 ? REG_Y0BAR : REG_Y1BAR,

				vb2_dma_contig_plane_paddr(&buf->vb_buf, 0));

				vb2_dma_contig_plane_dma_addr(&buf->vb_buf, 0));

		set_bit(CF_SINGLE_BUFFER, &cam->flags);

		singles++;

		return;
@@ -461,7 +461,7 @@ static void mcam_set_contig_buffer(struct mcam_camera *cam, int frame) 
	buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer, queue);

	list_del_init(&buf->queue);

	mcam_reg_write(cam, frame == 0 ? REG_Y0BAR : REG_Y1BAR,

			vb2_dma_contig_plane_paddr(&buf->vb_buf, 0));

			vb2_dma_contig_plane_dma_addr(&buf->vb_buf, 0));

	cam->vb_bufs[frame] = buf;

	clear_bit(CF_SINGLE_BUFFER, &cam->flags);

}

drivers/media/video/mx3_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int mx3_videobuf_prepare(struct vb2_buffer *vb) 
	}



	if (buf->state == CSI_BUF_NEEDS_INIT) {

		sg_dma_address(sg)	= vb2_dma_contig_plane_paddr(vb, 0);

		sg_dma_address(sg)	= vb2_dma_contig_plane_dma_addr(vb, 0);

		sg_dma_len(sg)		= new_size;



		buf->txd = ichan->dma_chan.device->device_prep_slave_sg(

drivers/media/video/s5p-fimc/fimc-core.c

+3 −3
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ int fimc_prepare_addr(struct fimc_ctx *ctx, struct vb2_buffer *vb, 
	dbg("memplanes= %d, colplanes= %d, pix_size= %d",

		frame->fmt->memplanes, frame->fmt->colplanes, pix_size);



	paddr->y = vb2_dma_contig_plane_paddr(vb, 0);

	paddr->y = vb2_dma_contig_plane_dma_addr(vb, 0);



	if (frame->fmt->memplanes == 1) {

		switch (frame->fmt->colplanes) {
@@ -485,10 +485,10 @@ int fimc_prepare_addr(struct fimc_ctx *ctx, struct vb2_buffer *vb, 
		}

	} else {

		if (frame->fmt->memplanes >= 2)

			paddr->cb = vb2_dma_contig_plane_paddr(vb, 1);

			paddr->cb = vb2_dma_contig_plane_dma_addr(vb, 1);



		if (frame->fmt->memplanes == 3)

			paddr->cr = vb2_dma_contig_plane_paddr(vb, 2);

			paddr->cr = vb2_dma_contig_plane_dma_addr(vb, 2);

	}



	dbg("PHYS_ADDR: y= 0x%X  cb= 0x%X cr= 0x%X ret= %d",

drivers/media/video/s5p-mfc/s5p_mfc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;