Skip to content

Commit

Permalink
[media] media i.MX27 camera: Fix field_count handling
Browse files Browse the repository at this point in the history
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: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Javier Martin authored and Mauro Carvalho Chehab committed Jan 6, 2012
1 parent f410991 commit ccd1a49
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/media/video/mx2_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ struct mx2_camera_dev {
dma_addr_t discard_buffer_dma;
size_t discard_size;
struct mx2_fmt_cfg *emma_prp;
u32 frame_count;
};

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

pcdev->icd = icd;
pcdev->frame_count = 0;

dev_info(icd->parent, "Camera driver attached to camera %d\n",
icd->devnum);
Expand Down Expand Up @@ -1374,7 +1376,8 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
list_del(&vb->queue);
vb->state = state;
do_gettimeofday(&vb->ts);
vb->field_count++;
vb->field_count = pcdev->frame_count * 2;
pcdev->frame_count++;

wake_up(&vb->done);
}
Expand Down

0 comments on commit ccd1a49

Please sign in to comment.