public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
To: ext Gary Thomas <gary@mlbassoc.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: Re: DSS2 questions
Date: Thu, 06 Aug 2009 16:16:37 +0300	[thread overview]
Message-ID: <4A7AD7B5.10500@nokia.com> (raw)
In-Reply-To: <4A7AC798.6070409@mlbassoc.com>

Hi,

ext Gary Thomas wrote:
> 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?

The problem is that I have rebased my tree so that I end up with a clean 
set of patches that can be posted to mailing lists. And rebasing means 
changing history, which means that you cannot merge it normally.

Perhaps I should keep the master branch as it is, and do rebasing on a 
separate branch. I don't know, I'm no git-master ;).

If you have no changes of your own in the branch, you can do
git reset --hard origin/master
which will reset that branch to the exact version that is in origin/master.

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

You'll see it when you understand how git works ;)

> 
> 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?

You need to change the framebuffer to YUV color mode. And YUV only works 
on video overlays, so you need to setup video overlay to be shown on the 
LCD or TV.

If you have fb1 as a video overlay, you can do for example:

fbset -fb /dev/fb1 -nonstd 1

which sets fb1 to YUV422 mode. 8 would be YUY422. Those numbers come 
from omapfb.h, enum omapfb_color_format.

Check also Documentation/arm/OMAP/DSS, if you haven't already done so.

  Tomi

  reply	other threads:[~2009-08-06 13:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-06 12:07 DSS2 questions Gary Thomas
2009-08-06 13:16 ` Tomi Valkeinen [this message]
2009-08-06 13:42   ` Gary Thomas
2009-08-06 14:00     ` Tomi Valkeinen
2009-08-06 14:24       ` Gary Thomas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A7AD7B5.10500@nokia.com \
    --to=tomi.valkeinen@nokia.com \
    --cc=gary@mlbassoc.com \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox