Re: Branch for fbdriver (Re: [PATCH 1/2] OMAP: Make dpll4_m4_ck programmable with clk_set_rate())

[Tony Lindgren <tony@atomide.com>]

* Tomi Valkeinen <tomi.valkeinen@nokia.com> [081208 06:55]:
> Hi,
> 
> On Fri, 2008-12-05 at 18:12 -0800, ext Tony Lindgren wrote:
> > * Måns Rullgård <mans@mansr.com> [081205 17:40]:
> > > Tony Lindgren <tony@atomide.com> writes:
> > > 
> > > > Måns, I heard you have some display patches? How about queuing up
> > > > those on the fbdev list?
> > > 
> > > It looks like Tomi's driver is shaping up nicely, so it's probably not
> > > worthwhile spending any significant time on the current driver.  If
> > > anyone is interested, everything I have is in my git tree.
> > 
> > OK, good to know. Tomi, do you have a git branch against the
> > mainline kernel for your driver?
> > 
> > We could start mirroring it on linux-omap and then start automerging
> > it on daily basis to linux-omap for testing (Assuming it does not cause
> > problems with other stuff :)
> 
> I have a git tree against current linux-omap tree at
> http://www.bat.org/~tomba/git/linux-omap-dss.git
> 
> It is possible to have a branch based on Linus' tree also, but it's more
> maintenance work as I need a bunch of omap patches that are not in
> Linus' tree. (Actually, I have never tested DSS2 with Linus' tree, so
> I'm not sure how much stuff there's missing).

Well let's see what needs to be patched outside drivers/video and get
it merged to mainline so you can maintain your patches against the
mainline tree.

If something is not in the mainline for drivers/video, we can try to
get those integrated to mainline, or add them to your queue for now.

> I'd like to get the DSS2 working on OMAP2 also, but I'm (still) waiting
> for my N810. Half a year ago the DSS2 did work on OMAP2, but I'm sure
> it's since been broken, and needs some healing.
> 
> But after that I'm all for it. 

OK

> However, there is a small breakage because of the VRAM manager and
> OMAP_TAG removal. That code is common for the old and new DSS. I have a
> patch to fix the old DSS to use the VRAM manager, but I don't think it's
> a good idea to break the old working code with new experimental code =).
> So I think I'll see if I can easily separate the old and new boot time
> memory allocation.

Well we need to get rid of the old OMAP_TAGs too.

> But what does it mean in practice? 
> 
> Mirroring means you (script?) will fetch a branch from my tree to dss2
> branch on linux-omap tree?

Yes, I'll git-fetch your branch automatically once a day.

> What does automerging mean?

I'll merge your branch into linux-omap master branch once a day
automatically.

> Does it mean I can still continue rebasing my tree to keep it clean?

Yes!

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html