|
@@ -182,6 +182,7 @@ module_param(debug, int, 0644);
|
|
V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE)
|
|
V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE)
|
|
|
|
|
|
static void __vb2_queue_cancel(struct vb2_queue *q);
|
|
static void __vb2_queue_cancel(struct vb2_queue *q);
|
|
|
|
+static void __enqueue_in_driver(struct vb2_buffer *vb);
|
|
|
|
|
|
/**
|
|
/**
|
|
* __vb2_buf_mem_alloc() - allocate video memory for the given buffer
|
|
* __vb2_buf_mem_alloc() - allocate video memory for the given buffer
|
|
@@ -1153,8 +1154,9 @@ EXPORT_SYMBOL_GPL(vb2_plane_cookie);
|
|
/**
|
|
/**
|
|
* vb2_buffer_done() - inform videobuf that an operation on a buffer is finished
|
|
* vb2_buffer_done() - inform videobuf that an operation on a buffer is finished
|
|
* @vb: vb2_buffer returned from the driver
|
|
* @vb: vb2_buffer returned from the driver
|
|
- * @state: either VB2_BUF_STATE_DONE if the operation finished successfully
|
|
|
|
- * or VB2_BUF_STATE_ERROR if the operation finished with an error.
|
|
|
|
|
|
+ * @state: either VB2_BUF_STATE_DONE if the operation finished successfully,
|
|
|
|
+ * VB2_BUF_STATE_ERROR if the operation finished with an error or
|
|
|
|
+ * VB2_BUF_STATE_QUEUED if the driver wants to requeue buffers.
|
|
* If start_streaming fails then it should return buffers with state
|
|
* If start_streaming fails then it should return buffers with state
|
|
* VB2_BUF_STATE_QUEUED to put them back into the queue.
|
|
* VB2_BUF_STATE_QUEUED to put them back into the queue.
|
|
*
|
|
*
|
|
@@ -1205,8 +1207,11 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
|
|
atomic_dec(&q->owned_by_drv_count);
|
|
atomic_dec(&q->owned_by_drv_count);
|
|
spin_unlock_irqrestore(&q->done_lock, flags);
|
|
spin_unlock_irqrestore(&q->done_lock, flags);
|
|
|
|
|
|
- if (state == VB2_BUF_STATE_QUEUED)
|
|
|
|
|
|
+ if (state == VB2_BUF_STATE_QUEUED) {
|
|
|
|
+ if (q->start_streaming_called)
|
|
|
|
+ __enqueue_in_driver(vb);
|
|
return;
|
|
return;
|
|
|
|
+ }
|
|
|
|
|
|
/* Inform any processes that may be waiting for buffers */
|
|
/* Inform any processes that may be waiting for buffers */
|
|
wake_up(&q->done_wq);
|
|
wake_up(&q->done_wq);
|