hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: rcar-vin: allocate a scratch buffer at stream start 

Before starting a capture, allocate a scratch buffer which can be used
by the driver to give to the hardware if no buffers are available from
userspace. The buffer is not used in this patch but prepares for future
refactoring where the scratch buffer can be used to avoid the need to
fallback on single capture mode if userspace can't queue buffers as fast
as the VIN driver consumes them.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Niklas Söderlund 2018-03-13 22:49:09 -04:00 committed by Mauro Carvalho Chehab
parent 579260a5ef
commit 6a8ffa8b4c
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/platform/rcar-vin/rcar-dma.c
View File

@ -1076,6 +1076,17 @@ static int rvin_start_streaming(struct vb2_queue *vq, unsigned int count)
unsigned long flags;
int ret;
/* Allocate scratch buffer. */
vin->scratch = dma_alloc_coherent(vin->dev, vin->format.sizeimage,
&vin->scratch_phys, GFP_KERNEL);
if (!vin->scratch) {
spin_lock_irqsave(&vin->qlock, flags);
return_all_buffers(vin, VB2_BUF_STATE_QUEUED);
spin_unlock_irqrestore(&vin->qlock, flags);
vin_err(vin, "Failed to allocate scratch buffer\n");
return -ENOMEM;
}
sd = vin_to_source(vin);
v4l2_subdev_call(sd, video, s_stream, 1);
@ -1091,6 +1102,10 @@ static int rvin_start_streaming(struct vb2_queue *vq, unsigned int count)
spin_unlock_irqrestore(&vin->qlock, flags);
if (ret)
dma_free_coherent(vin->dev, vin->format.sizeimage, vin->scratch,
vin->scratch_phys);
return ret;
}
@ -1141,6 +1156,10 @@ static void rvin_stop_streaming(struct vb2_queue *vq)
/* disable interrupts */
rvin_disable_interrupts(vin);
/* Free scratch buffer. */
dma_free_coherent(vin->dev, vin->format.sizeimage, vin->scratch,
vin->scratch_phys);
}
static const struct vb2_ops rvin_qops = {

4
drivers/media/platform/rcar-vin/rcar-vin.h
View File

@ -102,6 +102,8 @@ struct rvin_graph_entity {
*
* @lock: protects @queue
* @queue: vb2 buffers queue
* @scratch: cpu address for scratch buffer
* @scratch_phys: physical address of the scratch buffer
*
* @qlock: protects @queue_buf, @buf_list, @continuous, @sequence
* @state
@ -130,6 +132,8 @@ struct rvin_dev {
struct mutex lock;
struct vb2_queue queue;
void *scratch;
dma_addr_t scratch_phys;
spinlock_t qlock;
struct vb2_v4l2_buffer *queue_buf[HW_BUFFER_NUM];