OMAP3 ISP and camera drivers (update)

OMAP3 ISP and camera drivers (update)

[Sakari Ailus]

Hi,

I've updated the patchset in Gitorious.

<URL:http://www.gitorious.org/projects/omap3camera>

Changes include

- Power management support. ISP suspend/resume should work now.

- Reindented and cleaned up everything. There are still some warnings 
from checkpatch.pl from the CSI2 code.

- Fix for crash in device registration, posted to list already. (Thanks, 
Vaibhav, Alexey!)

- LSC errors should be handled properly now.

I won't post the modified patches to the list this time since I guess it 
wouldn't be much of use, I guess. Or does someone want that? :)

-- 
Sakari Ailus
sakari.ailus@maxwell.research.nokia.com

Re: OMAP3 ISP and camera drivers (update)

[DongSoo(Nathaniel) Kim]

Hi Sakari,

I've been trying to pull your gitorious patchset into my linux-omap
repository (which is completely clean and up-to-date), but I'm having
some problem.
Please find following messages. I captured my git repository messages.

kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pull

Already up-to-date.

kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git status

# On branch master

nothing to commit (working directory clean)

kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$
git pull http://git.gitorious.org/omap3camera/mainline.git v4l iommu
omap3camera base

error: Could not read 5b007183d51543624bc9f582966f245a64157b57

error: Could not read fa8977215db5ab6139379e95efc193e45833afa3

error: Could not read 7de046a6a8446358001c38ad1d0b2b829ca0c98c

error: Could not read 5b007183d51543624bc9f582966f245a64157b57

Unable to find common commit with dc05ee10583dca44e0f8d4109bd1397ee3c5ffae

Automatic merge failed; fix conflicts and then commit the result.




I guess other people should also have the same issue with it. or am I
doing wrong way?
Please let me know


On Sat, Mar 7, 2009 at 12:32 AM, Sakari Ailus
<sakari.ailus@maxwell.research.nokia.com> wrote:
> Hi,
>
> I've updated the patchset in Gitorious.
>
> <URL:http://www.gitorious.org/projects/omap3camera>
>
> Changes include
>
> - Power management support. ISP suspend/resume should work now.
>
> - Reindented and cleaned up everything. There are still some warnings from
> checkpatch.pl from the CSI2 code.
>
> - Fix for crash in device registration, posted to list already. (Thanks,
> Vaibhav, Alexey!)
>
> - LSC errors should be handled properly now.
>
> I won't post the modified patches to the list this time since I guess it
> wouldn't be much of use, I guess. Or does someone want that? :)
>
> --
> Sakari Ailus
> sakari.ailus@maxwell.research.nokia.com
>



-- 
========================================================
DongSoo(Nathaniel), Kim
Engineer
Mobile S/W Platform Lab. S/W Team.
DMC
Samsung Electronics CO., LTD.
e-mail : dongsoo.kim@gmail.com
          dongsoo45.kim@samsung.com
========================================================

Re: OMAP3 ISP and camera drivers (update)

[Arun KS]

2009/3/9 DongSoo(Nathaniel) Kim <dongsoo.kim@gmail.com>:
> Hi Sakari,
>
> I've been trying to pull your gitorious patchset into my linux-omap
> repository (which is completely clean and up-to-date), but I'm having
> some problem.
> Please find following messages. I captured my git repository messages.
>
> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pull
>
> Already up-to-date.
>
> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git status
>
> # On branch master
>
> nothing to commit (working directory clean)
>
> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$
> git pull http://git.gitorious.org/omap3camera/mainline.git v4l iommu
> omap3camera base
>
> error: Could not read 5b007183d51543624bc9f582966f245a64157b57
>
> error: Could not read fa8977215db5ab6139379e95efc193e45833afa3
>
> error: Could not read 7de046a6a8446358001c38ad1d0b2b829ca0c98c
>
> error: Could not read 5b007183d51543624bc9f582966f245a64157b57
>
> Unable to find common commit with dc05ee10583dca44e0f8d4109bd1397ee3c5ffae
>
> Automatic merge failed; fix conflicts and then commit the result.
>
>
>
>
> I guess other people should also have the same issue with it. or am I
> doing wrong way?
> Please let me know

Hi Nate,

I tried this git pull git://git.gitorious.org/omap3camera/mainline.git
v4l iommu omap3camera base
and it works for me.

Thanks,
Arun
>
>
> On Sat, Mar 7, 2009 at 12:32 AM, Sakari Ailus
> <sakari.ailus@maxwell.research.nokia.com> wrote:
>> Hi,
>>
>> I've updated the patchset in Gitorious.
>>
>> <URL:http://www.gitorious.org/projects/omap3camera>
>>
>> Changes include
>>
>> - Power management support. ISP suspend/resume should work now.
>>
>> - Reindented and cleaned up everything. There are still some warnings from
>> checkpatch.pl from the CSI2 code.
>>
>> - Fix for crash in device registration, posted to list already. (Thanks,
>> Vaibhav, Alexey!)
>>
>> - LSC errors should be handled properly now.
>>
>> I won't post the modified patches to the list this time since I guess it
>> wouldn't be much of use, I guess. Or does someone want that? :)
>>
>> --
>> Sakari Ailus
>> sakari.ailus@maxwell.research.nokia.com
>>
>
>
>
> --
> ========================================================
> DongSoo(Nathaniel), Kim
> Engineer
> Mobile S/W Platform Lab. S/W Team.
> DMC
> Samsung Electronics CO., LTD.
> e-mail : dongsoo.kim@gmail.com
>          dongsoo45.kim@samsung.com
> ========================================================
> --
> 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
>

Re: OMAP3 ISP and camera drivers (update)

[Dongsoo, Nathaniel Kim]

Hello Arun,

I've tried again after receiving your mail.
It seems to be weired but it works this time. Difference between last
time is I cloned linux-omap repo again and tried pulled Sakari's repo
into that.
It could be my fault maybe ;(
Strange day. Sorry for making you confused.

Nate


On Mon, Mar 9, 2009 at 7:18 PM, Arun KS <getarunks@gmail.com> wrote:
> 2009/3/9 DongSoo(Nathaniel) Kim <dongsoo.kim@gmail.com>:
>> Hi Sakari,
>>
>> I've been trying to pull your gitorious patchset into my linux-omap
>> repository (which is completely clean and up-to-date), but I'm having
>> some problem.
>> Please find following messages. I captured my git repository messages.
>>
>> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pull
>>
>> Already up-to-date.
>>
>> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git status
>>
>> # On branch master
>>
>> nothing to commit (working directory clean)
>>
>> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$
>> git pull http://git.gitorious.org/omap3camera/mainline.git v4l iommu
>> omap3camera base
>>
>> error: Could not read 5b007183d51543624bc9f582966f245a64157b57
>>
>> error: Could not read fa8977215db5ab6139379e95efc193e45833afa3
>>
>> error: Could not read 7de046a6a8446358001c38ad1d0b2b829ca0c98c
>>
>> error: Could not read 5b007183d51543624bc9f582966f245a64157b57
>>
>> Unable to find common commit with dc05ee10583dca44e0f8d4109bd1397ee3c5ffae
>>
>> Automatic merge failed; fix conflicts and then commit the result.
>>
>>
>>
>>
>> I guess other people should also have the same issue with it. or am I
>> doing wrong way?
>> Please let me know
>
> Hi Nate,
>
> I tried this git pull git://git.gitorious.org/omap3camera/mainline.git
> v4l iommu omap3camera base
> and it works for me.
>
> Thanks,
> Arun
>>
>>
>> On Sat, Mar 7, 2009 at 12:32 AM, Sakari Ailus
>> <sakari.ailus@maxwell.research.nokia.com> wrote:
>>> Hi,
>>>
>>> I've updated the patchset in Gitorious.
>>>
>>> <URL:http://www.gitorious.org/projects/omap3camera>
>>>
>>> Changes include
>>>
>>> - Power management support. ISP suspend/resume should work now.
>>>
>>> - Reindented and cleaned up everything. There are still some warnings from
>>> checkpatch.pl from the CSI2 code.
>>>
>>> - Fix for crash in device registration, posted to list already. (Thanks,
>>> Vaibhav, Alexey!)
>>>
>>> - LSC errors should be handled properly now.
>>>
>>> I won't post the modified patches to the list this time since I guess it
>>> wouldn't be much of use, I guess. Or does someone want that? :)
>>>
>>> --
>>> Sakari Ailus
>>> sakari.ailus@maxwell.research.nokia.com
>>>
>>
>>
>>
>> --
>> ========================================================
>> DongSoo(Nathaniel), Kim
>> Engineer
>> Mobile S/W Platform Lab. S/W Team.
>> DMC
>> Samsung Electronics CO., LTD.
>> e-mail : dongsoo.kim@gmail.com
>>          dongsoo45.kim@samsung.com
>> ========================================================
>> --
>> 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
>>
>



-- 
========================================================
DongSoo, Nathaniel Kim
Engineer
Mobile S/W Platform Lab.
Digital Media & Communications R&D Centre
Samsung Electronics CO., LTD.
e-mail : dongsoo.kim@gmail.com
          dongsoo45.kim@samsung.com
========================================================

RE: OMAP3 ISP and camera drivers (update)

[Aguirre Rodriguez, Sergio Alberto]

> -----Original Message-----
> From: Sakari Ailus [mailto:sakari.ailus@maxwell.research.nokia.com]
> Sent: Friday, March 06, 2009 9:32 AM
> To: linux-media@vger.kernel.org
> Cc: Aguirre Rodriguez, Sergio Alberto; DongSoo Kim; Hiremath, Vaibhav;
> Toivonen Tuukka Olli Artturi; Koskipää Antti Jussi Petteri; Cohen David
> Abraham; Alexey Klimov
> Subject: OMAP3 ISP and camera drivers (update)
> 
> Hi,
> 
> I've updated the patchset in Gitorious.
> 
> <URL:http://www.gitorious.org/projects/omap3camera>
> 
> Changes include
> 
> - Power management support. ISP suspend/resume should work now.
> 
> - Reindented and cleaned up everything. There are still some warnings
> from checkpatch.pl from the CSI2 code.
> 
> - Fix for crash in device registration, posted to list already. (Thanks,
> Vaibhav, Alexey!)
> 
> - LSC errors should be handled properly now.

Hi Sakari,

Doing a pull like you suggested in past release:
 
$ git pull http://git.gitorious.org/omap3camera/mainline.git v4l \
   iommu omap3camera base

Brings the same code than before...

I see that omap3isp branch is updated on gitorious, but trying to pull that branch gives merge errors.

Regards,
Sergio

Re: OMAP3 ISP and camera drivers (update)

[Sakari Ailus]

Aguirre Rodriguez, Sergio Alberto wrote:
> Hi Sakari,

Hello, Sergio!

> Doing a pull like you suggested in past release:
>  
> $ git pull http://git.gitorious.org/omap3camera/mainline.git v4l \
>    iommu omap3camera base
> 
> Brings the same code than before...

Oops. Could you try again now?

> I see that omap3isp branch is updated on gitorious, but trying to pull that branch gives merge errors.

Are you pulling it on top of linux-omap?

I've replaced the whole patchset so git tries to apply the new patches 
on top of the old ones.

-- 
Sakari Ailus
sakari.ailus@maxwell.research.nokia.com

Re: OMAP3 ISP and camera drivers (update)

[Dongsoo, Nathaniel Kim]

Hi Sakari,

I'm also having problem pulling your git now. I've pulled prior
version of yours and this is second time of pulling your repository.

Here you are a part of git diff message of mine after pulling your
TUESDAY MARCH 10 version. Looks like all about indent thing.

What should I do? If I want to pull your repository in my repository
and merging automatically.

I don't have any clue ;-(

kdsoo@chromatix:/home/share/GIT/OMAP3430/linux-2.6.29-rc3-omap_sakari$ git diff

diff --cc drivers/media/video/isp/isp.c

index 12a545c,54c839b..0000000

--- a/drivers/media/video/isp/isp.c

+++ b/drivers/media/video/isp/isp.c

@@@ -47,7 -47,7 +47,11 @@@

  static struct isp_device *omap3isp;



  static int isp_try_size(struct v4l2_pix_format *pix_input,

++<<<<<<< .merge_file_S5fkv9

 +                                      struct v4l2_pix_format *pix_output);

++=======

+                       struct v4l2_pix_format *pix_output);

++>>>>>>> .merge_file_ygq1qZ



On Tue, Mar 10, 2009 at 6:07 PM, Sakari Ailus
<sakari.ailus@maxwell.research.nokia.com> wrote:
> Aguirre Rodriguez, Sergio Alberto wrote:
>>
>> Hi Sakari,
>
> Hello, Sergio!
>
>> Doing a pull like you suggested in past release:
>>  $ git pull http://git.gitorious.org/omap3camera/mainline.git v4l \
>>   iommu omap3camera base
>>
>> Brings the same code than before...
>
> Oops. Could you try again now?
>
>> I see that omap3isp branch is updated on gitorious, but trying to pull
>> that branch gives merge errors.
>
> Are you pulling it on top of linux-omap?
>
> I've replaced the whole patchset so git tries to apply the new patches on
> top of the old ones.
>
> --
> Sakari Ailus
> sakari.ailus@maxwell.research.nokia.com
>



-- 
========================================================
DongSoo, Nathaniel Kim
Engineer
Mobile S/W Platform Lab.
Digital Media & Communications R&D Centre
Samsung Electronics CO., LTD.
e-mail : dongsoo.kim@gmail.com
          dongsoo45.kim@samsung.com
========================================================

Re: OMAP3 ISP and camera drivers (update)

[Sakari Ailus]

Dongsoo, Nathaniel Kim wrote:
> Hi Sakari,
> 
> I'm also having problem pulling your git now. I've pulled prior
> version of yours and this is second time of pulling your repository.
> 
> Here you are a part of git diff message of mine after pulling your
> TUESDAY MARCH 10 version. Looks like all about indent thing.
> 
> What should I do? If I want to pull your repository in my repository
> and merging automatically.
> 
> I don't have any clue ;-(

This branch branch now contains linux-omap plus the updated patchset. So 
the old patchset has been replaced by the new one. You're trying to pull 
the new patchset on top of the old one and merging very likely fails 
because of that.

-- 
Sakari Ailus
sakari.ailus@maxwell.research.nokia.com

Re: OMAP3 ISP and camera drivers (update)

[Mauro Carvalho Chehab]

Hi Sakari and other OMAP developers,

In order to better organize the OMAP stuff, I've created an account for Sakari
at linuxtv.org.

It is simply too much for me to review all those stuff again and again. So I
want to concentrate the process with Sakari, letting him do the review of OMAP
patches and coordinating the OMAP merge process. 

I expect that Sakari will send me periodic pull requests, after finishing the
discussions, for me to do a final review and merge upstream.

In order to reduce my pending list at patchwork, I'm marking all OMAP there
patches as RFC, trusting that Sakari will properly handle they.

Sakari, thanks for your help!

Cheers,
Mauro.

On Fri, 06 Mar 2009 17:32:06 +0200
Sakari Ailus <sakari.ailus@maxwell.research.nokia.com> wrote:

> Hi,
> 
> I've updated the patchset in Gitorious.
> 
> <URL:http://www.gitorious.org/projects/omap3camera>
> 
> Changes include
> 
> - Power management support. ISP suspend/resume should work now.
> 
> - Reindented and cleaned up everything. There are still some warnings 
> from checkpatch.pl from the CSI2 code.
> 
> - Fix for crash in device registration, posted to list already. (Thanks, 
> Vaibhav, Alexey!)
> 
> - LSC errors should be handled properly now.
> 
> I won't post the modified patches to the list this time since I guess it 
> wouldn't be much of use, I guess. Or does someone want that? :)
> 




Cheers,
Mauro