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

Commit 21d8582d authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] omap3isp: Rename isp_buffer isp_addr field to dma 



No functional changes.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent fbac1400

drivers/media/platform/omap3isp/ispccdc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1521,7 +1521,7 @@ static int ccdc_isr_buffer(struct isp_ccdc_device *ccdc) 




	buffer = omap3isp_video_buffer_next(&ccdc->video_out);

	buffer = omap3isp_video_buffer_next(&ccdc->video_out);

	if (buffer != NULL) {

	if (buffer != NULL) {

		ccdc_set_outaddr(ccdc, buffer->isp_addr);

		ccdc_set_outaddr(ccdc, buffer->dma);

		restart = 1;

		restart = 1;

	}

	}
@@ -1660,7 +1660,7 @@ static int ccdc_video_queue(struct isp_video *video, struct isp_buffer *buffer) 
	if (!(ccdc->output & CCDC_OUTPUT_MEMORY))

	if (!(ccdc->output & CCDC_OUTPUT_MEMORY))

		return -ENODEV;

		return -ENODEV;





	ccdc_set_outaddr(ccdc, buffer->isp_addr);

	ccdc_set_outaddr(ccdc, buffer->dma);





	/* We now have a buffer queued on the output, restart the pipeline

	/* We now have a buffer queued on the output, restart the pipeline

	 * on the next CCDC interrupt if running in continuous mode (or when

	 * on the next CCDC interrupt if running in continuous mode (or when

drivers/media/platform/omap3isp/ispccp2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -549,7 +549,7 @@ static void ccp2_isr_buffer(struct isp_ccp2_device *ccp2) 




	buffer = omap3isp_video_buffer_next(&ccp2->video_in);

	buffer = omap3isp_video_buffer_next(&ccp2->video_in);

	if (buffer != NULL)

	if (buffer != NULL)

		ccp2_set_inaddr(ccp2, buffer->isp_addr);

		ccp2_set_inaddr(ccp2, buffer->dma);





	pipe->state |= ISP_PIPELINE_IDLE_INPUT;

	pipe->state |= ISP_PIPELINE_IDLE_INPUT;
@@ -940,7 +940,7 @@ static int ccp2_video_queue(struct isp_video *video, struct isp_buffer *buffer) 
{

{

	struct isp_ccp2_device *ccp2 = &video->isp->isp_ccp2;

	struct isp_ccp2_device *ccp2 = &video->isp->isp_ccp2;





	ccp2_set_inaddr(ccp2, buffer->isp_addr);

	ccp2_set_inaddr(ccp2, buffer->dma);

	return 0;

	return 0;

}

}

drivers/media/platform/omap3isp/ispcsi2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -695,7 +695,7 @@ static void csi2_isr_buffer(struct isp_csi2_device *csi2) 
	if (buffer == NULL)

	if (buffer == NULL)

		return;

		return;





	csi2_set_outaddr(csi2, buffer->isp_addr);

	csi2_set_outaddr(csi2, buffer->dma);

	csi2_ctx_enable(isp, csi2, 0, 1);

	csi2_ctx_enable(isp, csi2, 0, 1);

}

}
@@ -812,7 +812,7 @@ static int csi2_queue(struct isp_video *video, struct isp_buffer *buffer) 
	struct isp_device *isp = video->isp;

	struct isp_device *isp = video->isp;

	struct isp_csi2_device *csi2 = &isp->isp_csi2a;

	struct isp_csi2_device *csi2 = &isp->isp_csi2a;





	csi2_set_outaddr(csi2, buffer->isp_addr);

	csi2_set_outaddr(csi2, buffer->dma);





	/*

	/*

	 * If streaming was enabled before there was a buffer queued

	 * If streaming was enabled before there was a buffer queued

drivers/media/platform/omap3isp/isppreview.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1499,14 +1499,14 @@ static void preview_isr_buffer(struct isp_prev_device *prev) 
	if (prev->input == PREVIEW_INPUT_MEMORY) {

	if (prev->input == PREVIEW_INPUT_MEMORY) {

		buffer = omap3isp_video_buffer_next(&prev->video_in);

		buffer = omap3isp_video_buffer_next(&prev->video_in);

		if (buffer != NULL)

		if (buffer != NULL)

			preview_set_inaddr(prev, buffer->isp_addr);

			preview_set_inaddr(prev, buffer->dma);

		pipe->state |= ISP_PIPELINE_IDLE_INPUT;

		pipe->state |= ISP_PIPELINE_IDLE_INPUT;

	}

	}





	if (prev->output & PREVIEW_OUTPUT_MEMORY) {

	if (prev->output & PREVIEW_OUTPUT_MEMORY) {

		buffer = omap3isp_video_buffer_next(&prev->video_out);

		buffer = omap3isp_video_buffer_next(&prev->video_out);

		if (buffer != NULL) {

		if (buffer != NULL) {

			preview_set_outaddr(prev, buffer->isp_addr);

			preview_set_outaddr(prev, buffer->dma);

			restart = 1;

			restart = 1;

		}

		}

		pipe->state |= ISP_PIPELINE_IDLE_OUTPUT;

		pipe->state |= ISP_PIPELINE_IDLE_OUTPUT;
@@ -1577,10 +1577,10 @@ static int preview_video_queue(struct isp_video *video, 
	struct isp_prev_device *prev = &video->isp->isp_prev;

	struct isp_prev_device *prev = &video->isp->isp_prev;





	if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)

	if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)

		preview_set_inaddr(prev, buffer->isp_addr);

		preview_set_inaddr(prev, buffer->dma);





	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

		preview_set_outaddr(prev, buffer->isp_addr);

		preview_set_outaddr(prev, buffer->dma);





	return 0;

	return 0;

}

}

drivers/media/platform/omap3isp/ispresizer.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1040,7 +1040,7 @@ static void resizer_isr_buffer(struct isp_res_device *res) 
	 */

	 */

	buffer = omap3isp_video_buffer_next(&res->video_out);

	buffer = omap3isp_video_buffer_next(&res->video_out);

	if (buffer != NULL) {

	if (buffer != NULL) {

		resizer_set_outaddr(res, buffer->isp_addr);

		resizer_set_outaddr(res, buffer->dma);

		restart = 1;

		restart = 1;

	}

	}
@@ -1049,7 +1049,7 @@ static void resizer_isr_buffer(struct isp_res_device *res) 
	if (res->input == RESIZER_INPUT_MEMORY) {

	if (res->input == RESIZER_INPUT_MEMORY) {

		buffer = omap3isp_video_buffer_next(&res->video_in);

		buffer = omap3isp_video_buffer_next(&res->video_in);

		if (buffer != NULL)

		if (buffer != NULL)

			resizer_set_inaddr(res, buffer->isp_addr);

			resizer_set_inaddr(res, buffer->dma);

		pipe->state |= ISP_PIPELINE_IDLE_INPUT;

		pipe->state |= ISP_PIPELINE_IDLE_INPUT;

	}

	}
@@ -1101,7 +1101,7 @@ static int resizer_video_queue(struct isp_video *video, 
	struct isp_res_device *res = &video->isp->isp_res;

	struct isp_res_device *res = &video->isp->isp_res;





	if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)

	if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)

		resizer_set_inaddr(res, buffer->isp_addr);

		resizer_set_inaddr(res, buffer->dma);





	/*

	/*

	 * We now have a buffer queued on the output. Despite what the

	 * We now have a buffer queued on the output. Despite what the
@@ -1116,7 +1116,7 @@ static int resizer_video_queue(struct isp_video *video, 
	 * continuous mode or when starting the stream.

	 * continuous mode or when starting the stream.

	 */

	 */

	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

		resizer_set_outaddr(res, buffer->isp_addr);

		resizer_set_outaddr(res, buffer->dma);





	return 0;

	return 0;

}

}