TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msm: camera_v2: differentiate streams with vb2 buffers.

Browse Source 
vb2_poll needs to be called only for streams that have
vb2 buffers associated with them. If this is not taken care of,
the function constantly returns an error code for non vb2 streams
resulting in the polling process hogging the CPU.

Change-Id: I70d29e1666478c07bf8513ead7499891a3f01bd6
Signed-off-by: Ankit Premrajka <ankitp@codeaurora.org>
This commit is contained in:
Ankit Premrajka
2013-04-04 09:39:21 -07:00
committed by Iliyan Malchev
parent c935d24183
commit 42f50cf3a6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/msm/camera_v2/camera/camera.c
View File

@@ -38,6 +38,7 @@
struct camera_v4l2_private {
struct v4l2_fh fh;
unsigned int stream_id;
unsigned int is_vb2_valid; /*0 if no vb2 buffers on stream, else 1*/
struct vb2_queue vb2_q;
};
@@ -314,6 +315,7 @@ static int camera_v4l2_s_fmt_vid_cap_mplane(struct file *filep, void *fh,
rc = camera_check_event_status(&event);
if (rc < 0)
goto set_fmt_fail;
sp->is_vb2_valid = 1;
}
return rc;
@@ -551,8 +553,8 @@ static unsigned int camera_v4l2_poll(struct file *filep,
{
int rc = 0;
struct camera_v4l2_private *sp = fh_to_private(filep->private_data);
rc = vb2_poll(&sp->vb2_q, filep, wait);
if (sp->is_vb2_valid == 1)
rc = vb2_poll(&sp->vb2_q, filep, wait);
poll_wait(filep, &sp->fh.wait, wait);
if (v4l2_event_pending(&sp->fh))