[media] vb2: drop v4l2_format argument from queue_setup
The queue_setup callback has a void pointer that is just for V4L2 and is the pointer to the v4l2_format struct that was passed to VIDIOC_CREATE_BUFS. The idea was that drivers would use the information from that struct to buffers suitable for the requested format. After the vb2 split series this pointer is now a void pointer, which is ugly, and the reality is that all existing drivers will effectively just look at the sizeimage field of v4l2_format. To make this more generic the queue_setup callback is changed: the void pointer is dropped, instead if the *num_planes argument is 0, then use the current format size, if it is non-zero, then it contains the number of requested planes and the sizes array contains the requested sizes. If either is unsupported, then return -EINVAL, otherwise use the requested size(s). Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:

zatwierdzone przez
Mauro Carvalho Chehab

rodzic
ecc2fe20e6
commit
df9ecb0cad
@@ -1015,28 +1015,33 @@ error_free:
|
||||
* ============================================================================
|
||||
*/
|
||||
static int jpu_queue_setup(struct vb2_queue *vq,
|
||||
const void *parg,
|
||||
unsigned int *nbuffers, unsigned int *nplanes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
const struct v4l2_format *fmt = parg;
|
||||
struct jpu_ctx *ctx = vb2_get_drv_priv(vq);
|
||||
struct jpu_q_data *q_data;
|
||||
unsigned int i;
|
||||
|
||||
q_data = jpu_get_q_data(ctx, vq->type);
|
||||
|
||||
if (*nplanes) {
|
||||
if (*nplanes != q_data->format.num_planes)
|
||||
return -EINVAL;
|
||||
|
||||
for (i = 0; i < *nplanes; i++) {
|
||||
unsigned int q_size = q_data->format.plane_fmt[i].sizeimage;
|
||||
|
||||
if (sizes[i] < q_size)
|
||||
return -EINVAL;
|
||||
alloc_ctxs[i] = ctx->jpu->alloc_ctx;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
*nplanes = q_data->format.num_planes;
|
||||
|
||||
for (i = 0; i < *nplanes; i++) {
|
||||
unsigned int q_size = q_data->format.plane_fmt[i].sizeimage;
|
||||
unsigned int f_size = fmt ?
|
||||
fmt->fmt.pix_mp.plane_fmt[i].sizeimage : 0;
|
||||
|
||||
if (fmt && f_size < q_size)
|
||||
return -EINVAL;
|
||||
|
||||
sizes[i] = fmt ? f_size : q_size;
|
||||
sizes[i] = q_data->format.plane_fmt[i].sizeimage;
|
||||
alloc_ctxs[i] = ctx->jpu->alloc_ctx;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user