* [PATCH] [media] v4l2: mem2mem: save irq flags correctly
@ 2013-05-24 0:41 John Sheu
2013-05-28 13:57 ` Kamil Debski
2013-05-28 14:33 ` Pawel Osciak
0 siblings, 2 replies; 3+ messages in thread
From: John Sheu @ 2013-05-24 0:41 UTC (permalink / raw)
To: linux-media; +Cc: mchehab, pawel, John Sheu
Save flags correctly when taking spinlocks in v4l2_m2m_try_schedule.
Signed-off-by: John Sheu <sheu@google.com>
---
drivers/media/v4l2-core/v4l2-mem2mem.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 66f599f..3606ff2 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -205,7 +205,7 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev)
static void v4l2_m2m_try_schedule(struct v4l2_m2m_ctx *m2m_ctx)
{
struct v4l2_m2m_dev *m2m_dev;
- unsigned long flags_job, flags;
+ unsigned long flags_job, flags_out, flags_cap;
m2m_dev = m2m_ctx->m2m_dev;
dprintk("Trying to schedule a job for m2m_ctx: %p\n", m2m_ctx);
@@ -223,23 +223,26 @@ static void v4l2_m2m_try_schedule(struct v4l2_m2m_ctx *m2m_ctx)
return;
}
- spin_lock_irqsave(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
+ spin_lock_irqsave(&m2m_ctx->out_q_ctx.rdy_spinlock, flags_out);
if (list_empty(&m2m_ctx->out_q_ctx.rdy_queue)) {
- spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
+ spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
+ flags_out);
spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
dprintk("No input buffers available\n");
return;
}
- spin_lock_irqsave(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);
+ spin_lock_irqsave(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags_cap);
if (list_empty(&m2m_ctx->cap_q_ctx.rdy_queue)) {
- spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);
- spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
+ spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock,
+ flags_cap);
+ spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
+ flags_out);
spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
dprintk("No output buffers available\n");
return;
}
- spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);
- spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
+ spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags_cap);
+ spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags_out);
if (m2m_dev->m2m_ops->job_ready
&& (!m2m_dev->m2m_ops->job_ready(m2m_ctx->priv))) {
--
1.8.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* RE: [PATCH] [media] v4l2: mem2mem: save irq flags correctly
2013-05-24 0:41 [PATCH] [media] v4l2: mem2mem: save irq flags correctly John Sheu
@ 2013-05-28 13:57 ` Kamil Debski
2013-05-28 14:33 ` Pawel Osciak
1 sibling, 0 replies; 3+ messages in thread
From: Kamil Debski @ 2013-05-28 13:57 UTC (permalink / raw)
To: 'John Sheu', linux-media; +Cc: mchehab, pawel
Hi Sheu,
Thank you for this patch. May I also ask you to add me to Cc of next mem2mem
patches, as I am the mem2mem submaintainer?
Best wishes,
--
Kamil Debski
Linux Kernel Developer
Samsung R&D Institute Poland
> -----Original Message-----
> From: linux-media-owner@vger.kernel.org [mailto:linux-media-
> owner@vger.kernel.org] On Behalf Of John Sheu
> Sent: Friday, May 24, 2013 2:42 AM
> To: linux-media@vger.kernel.org
> Cc: mchehab@redhat.com; pawel@osciak.com; John Sheu
> Subject: [PATCH] [media] v4l2: mem2mem: save irq flags correctly
>
> Save flags correctly when taking spinlocks in v4l2_m2m_try_schedule.
>
> Signed-off-by: John Sheu <sheu@google.com>
Acked-by: Kamil Debski <k.debski@samsung.com>
> ---
> drivers/media/v4l2-core/v4l2-mem2mem.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c
> b/drivers/media/v4l2-core/v4l2-mem2mem.c
> index 66f599f..3606ff2 100644
> --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
> +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
> @@ -205,7 +205,7 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev
> *m2m_dev) static void v4l2_m2m_try_schedule(struct v4l2_m2m_ctx
> *m2m_ctx) {
> struct v4l2_m2m_dev *m2m_dev;
> - unsigned long flags_job, flags;
> + unsigned long flags_job, flags_out, flags_cap;
>
> m2m_dev = m2m_ctx->m2m_dev;
> dprintk("Trying to schedule a job for m2m_ctx: %p\n", m2m_ctx);
> @@ -223,23 +223,26 @@ static void v4l2_m2m_try_schedule(struct
> v4l2_m2m_ctx *m2m_ctx)
> return;
> }
>
> - spin_lock_irqsave(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
> + spin_lock_irqsave(&m2m_ctx->out_q_ctx.rdy_spinlock, flags_out);
> if (list_empty(&m2m_ctx->out_q_ctx.rdy_queue)) {
> - spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
> flags);
> + spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
> + flags_out);
> spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
> dprintk("No input buffers available\n");
> return;
> }
> - spin_lock_irqsave(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);
> + spin_lock_irqsave(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags_cap);
> if (list_empty(&m2m_ctx->cap_q_ctx.rdy_queue)) {
> - spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock,
> flags);
> - spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
> flags);
> + spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock,
> + flags_cap);
> + spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
> + flags_out);
> spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
> dprintk("No output buffers available\n");
> return;
> }
> - spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);
> - spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
> + spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock,
> flags_cap);
> + spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
> flags_out);
>
> if (m2m_dev->m2m_ops->job_ready
> && (!m2m_dev->m2m_ops->job_ready(m2m_ctx->priv))) {
> --
> 1.8.2.1
>
> --
> 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] 3+ messages in thread* Re: [PATCH] [media] v4l2: mem2mem: save irq flags correctly
2013-05-24 0:41 [PATCH] [media] v4l2: mem2mem: save irq flags correctly John Sheu
2013-05-28 13:57 ` Kamil Debski
@ 2013-05-28 14:33 ` Pawel Osciak
1 sibling, 0 replies; 3+ messages in thread
From: Pawel Osciak @ 2013-05-28 14:33 UTC (permalink / raw)
To: John Sheu; +Cc: LMML, Mauro Carvalho Chehab
John, thanks for the patch.
On Thu, May 23, 2013 at 5:41 PM, John Sheu <sheu@google.com> wrote:
> Save flags correctly when taking spinlocks in v4l2_m2m_try_schedule.
>
> Signed-off-by: John Sheu <sheu@google.com>
Acked-by: Pawel Osciak <pawel@osciak.com>
> ---
> drivers/media/v4l2-core/v4l2-mem2mem.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
> index 66f599f..3606ff2 100644
> --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
> +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
> @@ -205,7 +205,7 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev)
> static void v4l2_m2m_try_schedule(struct v4l2_m2m_ctx *m2m_ctx)
> {
> struct v4l2_m2m_dev *m2m_dev;
> - unsigned long flags_job, flags;
> + unsigned long flags_job, flags_out, flags_cap;
>
> m2m_dev = m2m_ctx->m2m_dev;
> dprintk("Trying to schedule a job for m2m_ctx: %p\n", m2m_ctx);
> @@ -223,23 +223,26 @@ static void v4l2_m2m_try_schedule(struct v4l2_m2m_ctx *m2m_ctx)
> return;
> }
>
> - spin_lock_irqsave(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
> + spin_lock_irqsave(&m2m_ctx->out_q_ctx.rdy_spinlock, flags_out);
> if (list_empty(&m2m_ctx->out_q_ctx.rdy_queue)) {
> - spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
> + spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
> + flags_out);
> spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
> dprintk("No input buffers available\n");
> return;
> }
> - spin_lock_irqsave(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);
> + spin_lock_irqsave(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags_cap);
> if (list_empty(&m2m_ctx->cap_q_ctx.rdy_queue)) {
> - spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);
> - spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
> + spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock,
> + flags_cap);
> + spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock,
> + flags_out);
> spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
> dprintk("No output buffers available\n");
> return;
> }
> - spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);
> - spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);
> + spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags_cap);
> + spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags_out);
>
> if (m2m_dev->m2m_ops->job_ready
> && (!m2m_dev->m2m_ops->job_ready(m2m_ctx->priv))) {
> --
> 1.8.2.1
>
--
Best regards,
Pawel Osciak
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-28 14:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-24 0:41 [PATCH] [media] v4l2: mem2mem: save irq flags correctly John Sheu
2013-05-28 13:57 ` Kamil Debski
2013-05-28 14:33 ` Pawel Osciak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox