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

Commit ccd1a499 authored by Javier Martin's avatar Javier Martin Committed by Mauro Carvalho Chehab
Browse files

[media] media i.MX27 camera: Fix field_count handling 



To properly detect frame loss the driver must keep
track of a frame_count.

Furthermore, field_count use was erroneous because
in progressive format this must be incremented twice.

Signed-off-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f410991d

drivers/media/video/mx2_camera.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -258,6 +258,7 @@ struct mx2_camera_dev { 
	dma_addr_t		discard_buffer_dma;

	dma_addr_t		discard_buffer_dma;

	size_t			discard_size;

	size_t			discard_size;

	struct mx2_fmt_cfg	*emma_prp;

	struct mx2_fmt_cfg	*emma_prp;

	u32			frame_count;

};

};





/* buffer for one video frame */

/* buffer for one video frame */
@@ -371,6 +372,7 @@ static int mx2_camera_add_device(struct soc_camera_device *icd) 
	writel(pcdev->csicr1, pcdev->base_csi + CSICR1);

	writel(pcdev->csicr1, pcdev->base_csi + CSICR1);





	pcdev->icd = icd;

	pcdev->icd = icd;

	pcdev->frame_count = 0;





	dev_info(icd->parent, "Camera driver attached to camera %d\n",

	dev_info(icd->parent, "Camera driver attached to camera %d\n",

		 icd->devnum);

		 icd->devnum);
@@ -1374,7 +1376,8 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, 
		list_del(&vb->queue);

		list_del(&vb->queue);

		vb->state = state;

		vb->state = state;

		do_gettimeofday(&vb->ts);

		do_gettimeofday(&vb->ts);

		vb->field_count++;

		vb->field_count = pcdev->frame_count * 2;

		pcdev->frame_count++;





		wake_up(&vb->done);

		wake_up(&vb->done);

	}

	}