* [GIT PATCHES FOR 2.6.39] fix cx18 regression
@ 2011-01-26 7:23 Hans Verkuil
2011-01-31 14:12 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2011-01-26 7:23 UTC (permalink / raw)
To: linux-media; +Cc: Andy Walls
Mauro, please get this upstream asap since this fix needs to go into 2.6.38
as well.
Regards,
Hans
The following changes since commit e5fb95675639f064ca40df7ad319f1c380443999:
Hans Verkuil (1):
[media] vivi: fix compiler warning
are available in the git repository at:
ssh://linuxtv.org/git/hverkuil/media_tree.git cx18-fix
Hans Verkuil (1):
cx18: fix kernel oops when setting MPEG control before capturing.
drivers/media/video/cx18/cx18-driver.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
--
Hans Verkuil - video4linux developer - sponsored by Cisco
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [GIT PATCHES FOR 2.6.39] fix cx18 regression
2011-01-26 7:23 [GIT PATCHES FOR 2.6.39] fix cx18 regression Hans Verkuil
@ 2011-01-31 14:12 ` Mauro Carvalho Chehab
2011-02-02 23:50 ` Andy Walls
2011-02-05 12:13 ` Hans Verkuil
0 siblings, 2 replies; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2011-01-31 14:12 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Andy Walls
Em 26-01-2011 05:23, Hans Verkuil escreveu:
> Mauro, please get this upstream asap since this fix needs to go into 2.6.38
> as well.
>
> Regards,
>
> Hans
>
> The following changes since commit e5fb95675639f064ca40df7ad319f1c380443999:
> Hans Verkuil (1):
> [media] vivi: fix compiler warning
>
> are available in the git repository at:
>
> ssh://linuxtv.org/git/hverkuil/media_tree.git cx18-fix
>
> Hans Verkuil (1):
> cx18: fix kernel oops when setting MPEG control before capturing.
>
> drivers/media/video/cx18/cx18-driver.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
I tried to apply it against 2.6.38-rc2, but it failed:
mutex_init(&cx->serialize_lock);
mutex_init(&cx->gpio_lock);
mutex_init(&cx->epu2apu_mb_lock);
mutex_init(&cx->epu2cpu_mb_lock);
ret = cx18_create_in_workq(cx);
<<<<<<<
=======
cx->cxhdl.capabilities = CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
cx->cxhdl.ops = &cx18_cxhdl_ops;
cx->cxhdl.func = cx18_api_func;
cx->cxhdl.priv = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
ret = cx2341x_handler_init(&cx->cxhdl, 50);
>>>>>>>
if (ret)
return ret;
Perhaps this change requires some patch delayed for .39?
Cheers,
Mauro
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [GIT PATCHES FOR 2.6.39] fix cx18 regression
2011-01-31 14:12 ` Mauro Carvalho Chehab
@ 2011-02-02 23:50 ` Andy Walls
2011-02-03 7:09 ` Hans Verkuil
2011-02-05 12:13 ` Hans Verkuil
1 sibling, 1 reply; 6+ messages in thread
From: Andy Walls @ 2011-02-02 23:50 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: Hans Verkuil, linux-media
On Mon, 2011-01-31 at 12:12 -0200, Mauro Carvalho Chehab wrote:
> Em 26-01-2011 05:23, Hans Verkuil escreveu:
> > Mauro, please get this upstream asap since this fix needs to go into 2.6.38
> > as well.
> >
> > Regards,
> >
> > Hans
> >
> > The following changes since commit e5fb95675639f064ca40df7ad319f1c380443999:
> > Hans Verkuil (1):
> > [media] vivi: fix compiler warning
> >
> > are available in the git repository at:
> >
> > ssh://linuxtv.org/git/hverkuil/media_tree.git cx18-fix
> >
> > Hans Verkuil (1):
> > cx18: fix kernel oops when setting MPEG control before capturing.
> >
> > drivers/media/video/cx18/cx18-driver.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
>
> I tried to apply it against 2.6.38-rc2, but it failed:
>
> mutex_init(&cx->serialize_lock);
> mutex_init(&cx->gpio_lock);
> mutex_init(&cx->epu2apu_mb_lock);
> mutex_init(&cx->epu2cpu_mb_lock);
>
> ret = cx18_create_in_workq(cx);
> <<<<<<<
> =======
> cx->cxhdl.capabilities = CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
> cx->cxhdl.ops = &cx18_cxhdl_ops;
> cx->cxhdl.func = cx18_api_func;
> cx->cxhdl.priv = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
> ret = cx2341x_handler_init(&cx->cxhdl, 50);
> >>>>>>>
> if (ret)
> return ret;
>
> Perhaps this change requires some patch delayed for .39?
The bug was authored on 31 Dec 2010, but not comitted until 23 Jan 2011:
http://git.linuxtv.org/hverkuil/media_tree.git?a=commit;h=82f205b2f2a1deb1ab700a601ef48a4db4ca4f4e
Kernel 2.6.38-rc2 appears to have a date one day prior: 22 Jan 2011:
http://git.linuxtv.org/hverkuil/media_tree.git?a=commit;h=1bae4ce27c9c90344f23c65ea6966c50ffeae2f5
So the bug will be in whatever version comes out after 2.6.38-rc2
Regards,
Andy
> Cheers,
> Mauro
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PATCHES FOR 2.6.39] fix cx18 regression
2011-02-02 23:50 ` Andy Walls
@ 2011-02-03 7:09 ` Hans Verkuil
0 siblings, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2011-02-03 7:09 UTC (permalink / raw)
To: Andy Walls; +Cc: Mauro Carvalho Chehab, linux-media
On Thursday, February 03, 2011 00:50:12 Andy Walls wrote:
> On Mon, 2011-01-31 at 12:12 -0200, Mauro Carvalho Chehab wrote:
> > Em 26-01-2011 05:23, Hans Verkuil escreveu:
> > > Mauro, please get this upstream asap since this fix needs to go into 2.6.38
> > > as well.
> > >
> > > Regards,
> > >
> > > Hans
> > >
> > > The following changes since commit e5fb95675639f064ca40df7ad319f1c380443999:
> > > Hans Verkuil (1):
> > > [media] vivi: fix compiler warning
> > >
> > > are available in the git repository at:
> > >
> > > ssh://linuxtv.org/git/hverkuil/media_tree.git cx18-fix
> > >
> > > Hans Verkuil (1):
> > > cx18: fix kernel oops when setting MPEG control before capturing.
> > >
> > > drivers/media/video/cx18/cx18-driver.c | 1 +
> > > 1 files changed, 1 insertions(+), 0 deletions(-)
> > >
> >
> > I tried to apply it against 2.6.38-rc2, but it failed:
> >
> > mutex_init(&cx->serialize_lock);
> > mutex_init(&cx->gpio_lock);
> > mutex_init(&cx->epu2apu_mb_lock);
> > mutex_init(&cx->epu2cpu_mb_lock);
> >
> > ret = cx18_create_in_workq(cx);
> > <<<<<<<
> > =======
> > cx->cxhdl.capabilities = CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
> > cx->cxhdl.ops = &cx18_cxhdl_ops;
> > cx->cxhdl.func = cx18_api_func;
> > cx->cxhdl.priv = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
> > ret = cx2341x_handler_init(&cx->cxhdl, 50);
> > >>>>>>>
> > if (ret)
> > return ret;
> >
> > Perhaps this change requires some patch delayed for .39?
>
> The bug was authored on 31 Dec 2010, but not comitted until 23 Jan 2011:
>
> http://git.linuxtv.org/hverkuil/media_tree.git?a=commit;h=82f205b2f2a1deb1ab700a601ef48a4db4ca4f4e
>
> Kernel 2.6.38-rc2 appears to have a date one day prior: 22 Jan 2011:
>
> http://git.linuxtv.org/hverkuil/media_tree.git?a=commit;h=1bae4ce27c9c90344f23c65ea6966c50ffeae2f5
>
> So the bug will be in whatever version comes out after 2.6.38-rc2
I'll look at this tomorrow. It's been very busy for the past week and I haven't
had time to look into this.
It definitely doesn't require any other patches, but probably some new patch
changed the order of some lines causing the patch to fail.
Regards,
Hans
>
> Regards,
> Andy
>
> > Cheers,
> > Mauro
>
>
>
--
Hans Verkuil - video4linux developer - sponsored by Cisco
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PATCHES FOR 2.6.39] fix cx18 regression
2011-01-31 14:12 ` Mauro Carvalho Chehab
2011-02-02 23:50 ` Andy Walls
@ 2011-02-05 12:13 ` Hans Verkuil
1 sibling, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2011-02-05 12:13 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-media, Andy Walls
On Monday, January 31, 2011 15:12:58 Mauro Carvalho Chehab wrote:
> Em 26-01-2011 05:23, Hans Verkuil escreveu:
> > Mauro, please get this upstream asap since this fix needs to go into 2.6.38
> > as well.
> >
> > Regards,
> >
> > Hans
> >
> > The following changes since commit e5fb95675639f064ca40df7ad319f1c380443999:
> > Hans Verkuil (1):
> > [media] vivi: fix compiler warning
> >
> > are available in the git repository at:
> >
> > ssh://linuxtv.org/git/hverkuil/media_tree.git cx18-fix
> >
> > Hans Verkuil (1):
> > cx18: fix kernel oops when setting MPEG control before capturing.
> >
> > drivers/media/video/cx18/cx18-driver.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
>
> I tried to apply it against 2.6.38-rc2, but it failed:
I think there is a mixup here. The patch is for 2.6.39 and it should apply
cleanly. Please apply for 2.6.39!
It is only necessary to apply it to 2.6.38 if your pull request to Linus of
February 2nd ("V4L/DVB patches") is merged. It still hasn't been merged, so I
suspect that Linus refused them (or are they still pending?).
When I wrote the original mail I mistakenly assumed that the cx18 control
framework patches were already upstream.
So, if your pull request to Linus isn't merged for 2.6.38, then no action
regarding 2.6.38 needs to be taken. If it is merged, then this fix must
be included in 2.6.38 as well.
Regards,
Hans
>
> mutex_init(&cx->serialize_lock);
> mutex_init(&cx->gpio_lock);
> mutex_init(&cx->epu2apu_mb_lock);
> mutex_init(&cx->epu2cpu_mb_lock);
>
> ret = cx18_create_in_workq(cx);
> <<<<<<<
> =======
> cx->cxhdl.capabilities = CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
> cx->cxhdl.ops = &cx18_cxhdl_ops;
> cx->cxhdl.func = cx18_api_func;
> cx->cxhdl.priv = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
> ret = cx2341x_handler_init(&cx->cxhdl, 50);
> >>>>>>>
> if (ret)
> return ret;
>
> Perhaps this change requires some patch delayed for .39?
>
> Cheers,
> Mauro
> --
> 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
>
>
--
Hans Verkuil - video4linux developer - sponsored by Cisco
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PATCHES FOR 2.6.39] fix cx18 regression
@ 2011-02-03 12:23 Andy Walls
0 siblings, 0 replies; 6+ messages in thread
From: Andy Walls @ 2011-02-03 12:23 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Mauro Carvalho Chehab, linux-media
Hans,
What I was trying to say was that Mauro should have observed the patch fail to apply to 2.6.38-rc2. It appears the bug did not get commited until a day after 2.6.38-rc2 was tagged.
R,
Andy
Hans Verkuil <hverkuil@xs4all.nl> wrote:
>On Thursday, February 03, 2011 00:50:12 Andy Walls wrote:
>> On Mon, 2011-01-31 at 12:12 -0200, Mauro Carvalho Chehab wrote:
>> > Em 26-01-2011 05:23, Hans Verkuil escreveu:
>> > > Mauro, please get this upstream asap since this fix needs to go into 2.6.38
>> > > as well.
>> > >
>> > > Regards,
>> > >
>> > > Hans
>> > >
>> > > The following changes since commit e5fb95675639f064ca40df7ad319f1c380443999:
>> > > Hans Verkuil (1):
>> > > [media] vivi: fix compiler warning
>> > >
>> > > are available in the git repository at:
>> > >
>> > > ssh://linuxtv.org/git/hverkuil/media_tree.git cx18-fix
>> > >
>> > > Hans Verkuil (1):
>> > > cx18: fix kernel oops when setting MPEG control before capturing.
>> > >
>> > > drivers/media/video/cx18/cx18-driver.c | 1 +
>> > > 1 files changed, 1 insertions(+), 0 deletions(-)
>> > >
>> >
>> > I tried to apply it against 2.6.38-rc2, but it failed:
>> >
>> > mutex_init(&cx->serialize_lock);
>> > mutex_init(&cx->gpio_lock);
>> > mutex_init(&cx->epu2apu_mb_lock);
>> > mutex_init(&cx->epu2cpu_mb_lock);
>> >
>> > ret = cx18_create_in_workq(cx);
>> > <<<<<<<
>> > =======
>> > cx->cxhdl.capabilities = CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
>> > cx->cxhdl.ops = &cx18_cxhdl_ops;
>> > cx->cxhdl.func = cx18_api_func;
>> > cx->cxhdl.priv = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
>> > ret = cx2341x_handler_init(&cx->cxhdl, 50);
>> > >>>>>>>
>> > if (ret)
>> > return ret;
>> >
>> > Perhaps this change requires some patch delayed for .39?
>>
>> The bug was authored on 31 Dec 2010, but not comitted until 23 Jan 2011:
>>
>> http://git.linuxtv.org/hverkuil/media_tree.git?a=commit;h=82f205b2f2a1deb1ab700a601ef48a4db4ca4f4e
>>
>> Kernel 2.6.38-rc2 appears to have a date one day prior: 22 Jan 2011:
>>
>> http://git.linuxtv.org/hverkuil/media_tree.git?a=commit;h=1bae4ce27c9c90344f23c65ea6966c50ffeae2f5
>>
>> So the bug will be in whatever version comes out after 2.6.38-rc2
>
>I'll look at this tomorrow. It's been very busy for the past week and I haven't
>had time to look into this.
>
>It definitely doesn't require any other patches, but probably some new patch
>changed the order of some lines causing the patch to fail.
>
>Regards,
>
> Hans
>
>>
>> Regards,
>> Andy
>>
>> > Cheers,
>> > Mauro
>>
>>
>>
>
>--
>Hans Verkuil - video4linux developer - sponsored by Cisco
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-02-05 12:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-26 7:23 [GIT PATCHES FOR 2.6.39] fix cx18 regression Hans Verkuil
2011-01-31 14:12 ` Mauro Carvalho Chehab
2011-02-02 23:50 ` Andy Walls
2011-02-03 7:09 ` Hans Verkuil
2011-02-05 12:13 ` Hans Verkuil
-- strict thread matches above, loose matches on Subject: below --
2011-02-03 12:23 Andy Walls
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox