* [PATCH] v4l2 mem2mem
@ 2012-08-31 13:18 Sascha Hauer
2012-08-31 13:18 ` [PATCH 1/2] media v4l2-mem2mem: Use list_first_entry Sascha Hauer
2012-08-31 13:18 ` [PATCH 2/2] media v4l2-mem2mem: fix src/out and dst/cap num_rdy Sascha Hauer
0 siblings, 2 replies; 7+ messages in thread
From: Sascha Hauer @ 2012-08-31 13:18 UTC (permalink / raw)
To: linux-media; +Cc: Pawel Osciak, Mauro Carvalho Chehab, Marek Szyprowski
Two small patches, one fix and one more or less cosmetic patch for the
v4l2 mem2mem framework.
Comments welcome.
Thanks,
Sascha
----------------------------------------------------------------
Sascha Hauer (2):
media v4l2-mem2mem: Use list_first_entry
media v4l2-mem2mem: fix src/out and dst/cap num_rdy
drivers/media/video/v4l2-mem2mem.c | 6 +++---
include/media/v4l2-mem2mem.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/2] media v4l2-mem2mem: Use list_first_entry 2012-08-31 13:18 [PATCH] v4l2 mem2mem Sascha Hauer @ 2012-08-31 13:18 ` Sascha Hauer 2012-08-31 18:34 ` Marek Szyprowski 2012-09-01 1:28 ` Pawel Osciak 2012-08-31 13:18 ` [PATCH 2/2] media v4l2-mem2mem: fix src/out and dst/cap num_rdy Sascha Hauer 1 sibling, 2 replies; 7+ messages in thread From: Sascha Hauer @ 2012-08-31 13:18 UTC (permalink / raw) To: linux-media Cc: Pawel Osciak, Mauro Carvalho Chehab, Marek Szyprowski, Sascha Hauer Use list_first_entry instead of list_entry which makes the intention of the code more clear. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/media/video/v4l2-mem2mem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/v4l2-mem2mem.c b/drivers/media/video/v4l2-mem2mem.c index 975d0fa..aaa67d3 100644 --- a/drivers/media/video/v4l2-mem2mem.c +++ b/drivers/media/video/v4l2-mem2mem.c @@ -102,7 +102,7 @@ void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx) return NULL; } - b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer, list); + b = list_first_entry(&q_ctx->rdy_queue, struct v4l2_m2m_buffer, list); spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); return &b->vb; } @@ -122,7 +122,7 @@ void *v4l2_m2m_buf_remove(struct v4l2_m2m_queue_ctx *q_ctx) spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); return NULL; } - b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer, list); + b = list_first_entry(&q_ctx->rdy_queue, struct v4l2_m2m_buffer, list); list_del(&b->list); q_ctx->num_rdy--; spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); @@ -175,7 +175,7 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev) return; } - m2m_dev->curr_ctx = list_entry(m2m_dev->job_queue.next, + m2m_dev->curr_ctx = list_first_entry(&m2m_dev->job_queue, struct v4l2_m2m_ctx, queue); m2m_dev->curr_ctx->job_flags |= TRANS_RUNNING; spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] media v4l2-mem2mem: Use list_first_entry 2012-08-31 13:18 ` [PATCH 1/2] media v4l2-mem2mem: Use list_first_entry Sascha Hauer @ 2012-08-31 18:34 ` Marek Szyprowski 2012-09-01 1:28 ` Pawel Osciak 1 sibling, 0 replies; 7+ messages in thread From: Marek Szyprowski @ 2012-08-31 18:34 UTC (permalink / raw) To: Sascha Hauer; +Cc: linux-media, Pawel Osciak, Mauro Carvalho Chehab Hello, On 8/31/2012 3:18 PM, Sascha Hauer wrote: > Use list_first_entry instead of list_entry which makes the intention > of the code more clear. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > drivers/media/video/v4l2-mem2mem.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/video/v4l2-mem2mem.c b/drivers/media/video/v4l2-mem2mem.c > index 975d0fa..aaa67d3 100644 > --- a/drivers/media/video/v4l2-mem2mem.c > +++ b/drivers/media/video/v4l2-mem2mem.c > @@ -102,7 +102,7 @@ void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx) > return NULL; > } > > - b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer, list); > + b = list_first_entry(&q_ctx->rdy_queue, struct v4l2_m2m_buffer, list); > spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); > return &b->vb; > } > @@ -122,7 +122,7 @@ void *v4l2_m2m_buf_remove(struct v4l2_m2m_queue_ctx *q_ctx) > spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); > return NULL; > } > - b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer, list); > + b = list_first_entry(&q_ctx->rdy_queue, struct v4l2_m2m_buffer, list); > list_del(&b->list); > q_ctx->num_rdy--; > spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); > @@ -175,7 +175,7 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev) > return; > } > > - m2m_dev->curr_ctx = list_entry(m2m_dev->job_queue.next, > + m2m_dev->curr_ctx = list_first_entry(&m2m_dev->job_queue, > struct v4l2_m2m_ctx, queue); > m2m_dev->curr_ctx->job_flags |= TRANS_RUNNING; > spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); > Best regards -- Marek Szyprowski Samsung Poland R&D Center ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] media v4l2-mem2mem: Use list_first_entry 2012-08-31 13:18 ` [PATCH 1/2] media v4l2-mem2mem: Use list_first_entry Sascha Hauer 2012-08-31 18:34 ` Marek Szyprowski @ 2012-09-01 1:28 ` Pawel Osciak 1 sibling, 0 replies; 7+ messages in thread From: Pawel Osciak @ 2012-09-01 1:28 UTC (permalink / raw) To: Sascha Hauer Cc: linux-media, Pawel Osciak, Mauro Carvalho Chehab, Marek Szyprowski On Fri, Aug 31, 2012 at 6:18 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > Use list_first_entry instead of list_entry which makes the intention > of the code more clear. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- Acked-by: Pawel Osciak <pawel@osciak.com> Thanks for the patch Sascha! > drivers/media/video/v4l2-mem2mem.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/video/v4l2-mem2mem.c b/drivers/media/video/v4l2-mem2mem.c > index 975d0fa..aaa67d3 100644 > --- a/drivers/media/video/v4l2-mem2mem.c > +++ b/drivers/media/video/v4l2-mem2mem.c > @@ -102,7 +102,7 @@ void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx) > return NULL; > } > > - b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer, list); > + b = list_first_entry(&q_ctx->rdy_queue, struct v4l2_m2m_buffer, list); > spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); > return &b->vb; > } > @@ -122,7 +122,7 @@ void *v4l2_m2m_buf_remove(struct v4l2_m2m_queue_ctx *q_ctx) > spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); > return NULL; > } > - b = list_entry(q_ctx->rdy_queue.next, struct v4l2_m2m_buffer, list); > + b = list_first_entry(&q_ctx->rdy_queue, struct v4l2_m2m_buffer, list); > list_del(&b->list); > q_ctx->num_rdy--; > spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); > @@ -175,7 +175,7 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev) > return; > } > > - m2m_dev->curr_ctx = list_entry(m2m_dev->job_queue.next, > + m2m_dev->curr_ctx = list_first_entry(&m2m_dev->job_queue, > struct v4l2_m2m_ctx, queue); > m2m_dev->curr_ctx->job_flags |= TRANS_RUNNING; > spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] media v4l2-mem2mem: fix src/out and dst/cap num_rdy 2012-08-31 13:18 [PATCH] v4l2 mem2mem Sascha Hauer 2012-08-31 13:18 ` [PATCH 1/2] media v4l2-mem2mem: Use list_first_entry Sascha Hauer @ 2012-08-31 13:18 ` Sascha Hauer 2012-08-31 18:35 ` Marek Szyprowski 2012-09-01 1:29 ` Pawel Osciak 1 sibling, 2 replies; 7+ messages in thread From: Sascha Hauer @ 2012-08-31 13:18 UTC (permalink / raw) To: linux-media Cc: Pawel Osciak, Mauro Carvalho Chehab, Marek Szyprowski, Sascha Hauer src bufs belong to out queue, dst bufs belong to in queue. Currently this is not a real problem since all users currently need exactly one input and one output buffer. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- include/media/v4l2-mem2mem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index 16ac473..131cc4a 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -140,7 +140,7 @@ void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb); static inline unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) { - return m2m_ctx->cap_q_ctx.num_rdy; + return m2m_ctx->out_q_ctx.num_rdy; } /** @@ -150,7 +150,7 @@ unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) static inline unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) { - return m2m_ctx->out_q_ctx.num_rdy; + return m2m_ctx->cap_q_ctx.num_rdy; } void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] media v4l2-mem2mem: fix src/out and dst/cap num_rdy 2012-08-31 13:18 ` [PATCH 2/2] media v4l2-mem2mem: fix src/out and dst/cap num_rdy Sascha Hauer @ 2012-08-31 18:35 ` Marek Szyprowski 2012-09-01 1:29 ` Pawel Osciak 1 sibling, 0 replies; 7+ messages in thread From: Marek Szyprowski @ 2012-08-31 18:35 UTC (permalink / raw) To: Sascha Hauer; +Cc: linux-media, Pawel Osciak, Mauro Carvalho Chehab Hello, On 8/31/2012 3:18 PM, Sascha Hauer wrote: > src bufs belong to out queue, dst bufs belong to in queue. Currently > this is not a real problem since all users currently need exactly one > input and one output buffer. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > include/media/v4l2-mem2mem.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h > index 16ac473..131cc4a 100644 > --- a/include/media/v4l2-mem2mem.h > +++ b/include/media/v4l2-mem2mem.h > @@ -140,7 +140,7 @@ void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb); > static inline > unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) > { > - return m2m_ctx->cap_q_ctx.num_rdy; > + return m2m_ctx->out_q_ctx.num_rdy; > } > > /** > @@ -150,7 +150,7 @@ unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) > static inline > unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) > { > - return m2m_ctx->out_q_ctx.num_rdy; > + return m2m_ctx->cap_q_ctx.num_rdy; > } > > void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx); > Best regards -- Marek Szyprowski Samsung Poland R&D Center ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] media v4l2-mem2mem: fix src/out and dst/cap num_rdy 2012-08-31 13:18 ` [PATCH 2/2] media v4l2-mem2mem: fix src/out and dst/cap num_rdy Sascha Hauer 2012-08-31 18:35 ` Marek Szyprowski @ 2012-09-01 1:29 ` Pawel Osciak 1 sibling, 0 replies; 7+ messages in thread From: Pawel Osciak @ 2012-09-01 1:29 UTC (permalink / raw) To: Sascha Hauer Cc: linux-media, Pawel Osciak, Mauro Carvalho Chehab, Marek Szyprowski On Fri, Aug 31, 2012 at 6:18 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > src bufs belong to out queue, dst bufs belong to in queue. Currently > this is not a real problem since all users currently need exactly one > input and one output buffer. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- Acked-by: Pawel Osciak <pawel@osciak.com> > include/media/v4l2-mem2mem.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h > index 16ac473..131cc4a 100644 > --- a/include/media/v4l2-mem2mem.h > +++ b/include/media/v4l2-mem2mem.h > @@ -140,7 +140,7 @@ void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb); > static inline > unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) > { > - return m2m_ctx->cap_q_ctx.num_rdy; > + return m2m_ctx->out_q_ctx.num_rdy; > } > > /** > @@ -150,7 +150,7 @@ unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) > static inline > unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) > { > - return m2m_ctx->out_q_ctx.num_rdy; > + return m2m_ctx->cap_q_ctx.num_rdy; > } > > void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx); > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Best regards, Pawel Osciak ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-09-01 1:29 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-08-31 13:18 [PATCH] v4l2 mem2mem Sascha Hauer 2012-08-31 13:18 ` [PATCH 1/2] media v4l2-mem2mem: Use list_first_entry Sascha Hauer 2012-08-31 18:34 ` Marek Szyprowski 2012-09-01 1:28 ` Pawel Osciak 2012-08-31 13:18 ` [PATCH 2/2] media v4l2-mem2mem: fix src/out and dst/cap num_rdy Sascha Hauer 2012-08-31 18:35 ` Marek Szyprowski 2012-09-01 1:29 ` Pawel Osciak
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.