From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932881AbeCLSSP (ORCPT ); Mon, 12 Mar 2018 14:18:15 -0400 Received: from mx1.riseup.net ([198.252.153.129]:36825 "EHLO mx1.riseup.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932548AbeCLSSN (ORCPT ); Mon, 12 Mar 2018 14:18:13 -0400 X-Riseup-User-ID: 961C9ED564F86BF6DF6F6AD1A5E07A8FE8B4AD0A80ECAD3F81F85646348198A6 Subject: Re: [linux-sunxi] [PATCH 2/9] media: videobuf2-v4l2: Copy planes when needed in request qbuf To: paul.kocialkowski@bootlin.com Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Icenowy Zheng , Florent Revest , Alexandre Courbot , Hans Verkuil , Laurent Pinchart , Sakari Ailus , Maxime Ripard , Thomas van Kleef , "Signed-off-by : Bob Ham" , Thomas Petazzoni , Chen-Yu Tsai References: <20180309100933.15922-1-paul.kocialkowski@bootlin.com> <20180309100933.15922-3-paul.kocialkowski@bootlin.com> From: =?UTF-8?Q?Joonas_Kylm=c3=a4l=c3=a4?= Message-ID: Date: Mon, 12 Mar 2018 18:18:00 +0000 MIME-Version: 1.0 In-Reply-To: <20180309100933.15922-3-paul.kocialkowski@bootlin.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Paul Kocialkowski: > diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c > index 0627c3339572..c14528d4a518 100644 > --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c > +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c > @@ -592,6 +592,7 @@ int vb2_qbuf_request(struct vb2_queue *q, struct v4l2_buffer *b, > struct media_request *req; > struct vb2_buffer *vb; > int ret = 0; > + int i; > > if (b->request_fd <= 0) > return vb2_qbuf(q, b); > @@ -657,6 +658,17 @@ int vb2_qbuf_request(struct vb2_queue *q, struct v4l2_buffer *b, > qb->pre_req_state = vb->state; > qb->queue = q; > memcpy(&qb->v4l2_buf, b, sizeof(*b)); > + > + if (V4L2_TYPE_IS_MULTIPLANAR(b->type) && b->length > 0) { > + qb->v4l2_buf.m.planes = kcalloc(b->length, > + sizeof(struct v4l2_plane), > + GFP_KERNEL); > + > + for (i = 0; i < b->length; i++) > + memcpy(&qb->v4l2_buf.m.planes[i], &b->m.planes[i], > + sizeof(struct v4l2_plane)); > + } > + > vb->request = req; > vb->state = VB2_BUF_STATE_QUEUED; > list_add_tail(&qb->node, &data->queued_buffers); > @@ -672,6 +684,7 @@ EXPORT_SYMBOL_GPL(vb2_qbuf_request); > int vb2_request_submit(struct v4l2_request_entity_data *data) > { > struct v4l2_vb2_request_buffer *qb, *n; > + int i; > > /* v4l2 requests require at least one buffer to reach the device */ > if (list_empty(&data->queued_buffers)) { > @@ -686,6 +699,12 @@ int vb2_request_submit(struct v4l2_request_entity_data *data) > list_del(&qb->node); > vb->state = qb->pre_req_state; > ret = vb2_core_qbuf(q, vb->index, &qb->v4l2_buf); > + > + if (V4L2_TYPE_IS_MULTIPLANAR(qb->v4l2_buf.type) && > + qb->v4l2_buf.length > 0) The test "qb->v4l2_buf.length > 0" seems unnecessary as it's already checked in the loop: > + for (i = 0; i < qb->v4l2_buf.length; i++) > + kfree(&qb->v4l2_buf.m.planes[i]); > + > kfree(qb); > if (ret) > return ret; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Joonas_Kylm=c3=a4l=c3=a4?= Subject: Re: [PATCH 2/9] media: videobuf2-v4l2: Copy planes when needed in request qbuf Date: Mon, 12 Mar 2018 18:18:00 +0000 Message-ID: References: <20180309100933.15922-1-paul.kocialkowski@bootlin.com> <20180309100933.15922-3-paul.kocialkowski@bootlin.com> Reply-To: joonas.kylmala-X3B1VOXEql0@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: Sender: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org In-Reply-To: <20180309100933.15922-3-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org> Content-Language: en-US List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org Cc: linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, Icenowy Zheng , Florent Revest , Alexandre Courbot , Hans Verkuil , Laurent Pinchart , Sakari Ailus , Maxime Ripard , Thomas van Kleef , "Signed-off-by : Bob Ham" , Thomas Petazzoni , Chen-Yu Tsai List-Id: devicetree@vger.kernel.org Paul Kocialkowski: > diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c > index 0627c3339572..c14528d4a518 100644 > --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c > +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c > @@ -592,6 +592,7 @@ int vb2_qbuf_request(struct vb2_queue *q, struct v4l2_buffer *b, > struct media_request *req; > struct vb2_buffer *vb; > int ret = 0; > + int i; > > if (b->request_fd <= 0) > return vb2_qbuf(q, b); > @@ -657,6 +658,17 @@ int vb2_qbuf_request(struct vb2_queue *q, struct v4l2_buffer *b, > qb->pre_req_state = vb->state; > qb->queue = q; > memcpy(&qb->v4l2_buf, b, sizeof(*b)); > + > + if (V4L2_TYPE_IS_MULTIPLANAR(b->type) && b->length > 0) { > + qb->v4l2_buf.m.planes = kcalloc(b->length, > + sizeof(struct v4l2_plane), > + GFP_KERNEL); > + > + for (i = 0; i < b->length; i++) > + memcpy(&qb->v4l2_buf.m.planes[i], &b->m.planes[i], > + sizeof(struct v4l2_plane)); > + } > + > vb->request = req; > vb->state = VB2_BUF_STATE_QUEUED; > list_add_tail(&qb->node, &data->queued_buffers); > @@ -672,6 +684,7 @@ EXPORT_SYMBOL_GPL(vb2_qbuf_request); > int vb2_request_submit(struct v4l2_request_entity_data *data) > { > struct v4l2_vb2_request_buffer *qb, *n; > + int i; > > /* v4l2 requests require at least one buffer to reach the device */ > if (list_empty(&data->queued_buffers)) { > @@ -686,6 +699,12 @@ int vb2_request_submit(struct v4l2_request_entity_data *data) > list_del(&qb->node); > vb->state = qb->pre_req_state; > ret = vb2_core_qbuf(q, vb->index, &qb->v4l2_buf); > + > + if (V4L2_TYPE_IS_MULTIPLANAR(qb->v4l2_buf.type) && > + qb->v4l2_buf.length > 0) The test "qb->v4l2_buf.length > 0" seems unnecessary as it's already checked in the loop: > + for (i = 0; i < qb->v4l2_buf.length; i++) > + kfree(&qb->v4l2_buf.m.planes[i]); > + > kfree(qb); > if (ret) > return ret; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: joonas.kylmala@iki.fi (=?UTF-8?Q?Joonas_Kylm=c3=a4l=c3=a4?=) Date: Mon, 12 Mar 2018 18:18:00 +0000 Subject: [linux-sunxi] [PATCH 2/9] media: videobuf2-v4l2: Copy planes when needed in request qbuf In-Reply-To: <20180309100933.15922-3-paul.kocialkowski@bootlin.com> References: <20180309100933.15922-1-paul.kocialkowski@bootlin.com> <20180309100933.15922-3-paul.kocialkowski@bootlin.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Paul Kocialkowski: > diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c > index 0627c3339572..c14528d4a518 100644 > --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c > +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c > @@ -592,6 +592,7 @@ int vb2_qbuf_request(struct vb2_queue *q, struct v4l2_buffer *b, > struct media_request *req; > struct vb2_buffer *vb; > int ret = 0; > + int i; > > if (b->request_fd <= 0) > return vb2_qbuf(q, b); > @@ -657,6 +658,17 @@ int vb2_qbuf_request(struct vb2_queue *q, struct v4l2_buffer *b, > qb->pre_req_state = vb->state; > qb->queue = q; > memcpy(&qb->v4l2_buf, b, sizeof(*b)); > + > + if (V4L2_TYPE_IS_MULTIPLANAR(b->type) && b->length > 0) { > + qb->v4l2_buf.m.planes = kcalloc(b->length, > + sizeof(struct v4l2_plane), > + GFP_KERNEL); > + > + for (i = 0; i < b->length; i++) > + memcpy(&qb->v4l2_buf.m.planes[i], &b->m.planes[i], > + sizeof(struct v4l2_plane)); > + } > + > vb->request = req; > vb->state = VB2_BUF_STATE_QUEUED; > list_add_tail(&qb->node, &data->queued_buffers); > @@ -672,6 +684,7 @@ EXPORT_SYMBOL_GPL(vb2_qbuf_request); > int vb2_request_submit(struct v4l2_request_entity_data *data) > { > struct v4l2_vb2_request_buffer *qb, *n; > + int i; > > /* v4l2 requests require at least one buffer to reach the device */ > if (list_empty(&data->queued_buffers)) { > @@ -686,6 +699,12 @@ int vb2_request_submit(struct v4l2_request_entity_data *data) > list_del(&qb->node); > vb->state = qb->pre_req_state; > ret = vb2_core_qbuf(q, vb->index, &qb->v4l2_buf); > + > + if (V4L2_TYPE_IS_MULTIPLANAR(qb->v4l2_buf.type) && > + qb->v4l2_buf.length > 0) The test "qb->v4l2_buf.length > 0" seems unnecessary as it's already checked in the loop: > + for (i = 0; i < qb->v4l2_buf.length; i++) > + kfree(&qb->v4l2_buf.m.planes[i]); > + > kfree(qb); > if (ret) > return ret; >