public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* DSS2 questions
@ 2009-08-06 12:07 Gary Thomas
  2009-08-06 13:16 ` Tomi Valkeinen
  0 siblings, 1 reply; 5+ messages in thread
From: Gary Thomas @ 2009-08-06 12:07 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-omap

Tomi,

I've been following your DSS2 work, with reasonable success.
However, when I tried to pull from your repo today, I got
a ton of merge errors.  I cloned your tree a [little] while
back (it seems it was 2009-06-16, but where did the time go?)

Here's what I did:
  git clone http://www.bat.org/~tomba/git/linux-omap-dss.git
    HEAD=5bd374f9b199d46ae434489d56615b240de5a6d7
  git checkout -b my_branch origin/master
    ...
When I went to pull into my_branch, I got the merge errors.
Any clues what I did wrong?  How could/should I have managed
this better?

n.b. you earlier told me that git was better than sliced
bread; I'm still waiting to be shown the light :-)

Second question; I've set up my system much the same as the
boards you are working on, with an LCD and TV outputs.  I'm
a bit confused as to how I configure the overlays and managers
to be able to send YUV data directly through to either the
LCD or TV.  Can you explain this?

Thanks

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2009-08-06 14:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-06 12:07 DSS2 questions Gary Thomas
2009-08-06 13:16 ` Tomi Valkeinen
2009-08-06 13:42   ` Gary Thomas
2009-08-06 14:00     ` Tomi Valkeinen
2009-08-06 14:24       ` Gary Thomas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox