From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: "K, Mythri P" <mythripk@ti.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: Re: [PATCH v4 0/9] OMAP4 : DSS2 : HDMI support on OMAP4
Date: Wed, 9 Mar 2011 16:15:06 +0200 [thread overview]
Message-ID: <1299680106.2151.91.camel@deskari> (raw)
In-Reply-To: <1299671118-20839-1-git-send-email-mythripk@ti.com>
On Wed, 2011-03-09 at 05:45 -0600, K, Mythri P wrote:
> Adding HDMI support on OMAP4.
>
> HDMI is a driver that is similar to the VENC or the DSI driver to support
> HDMI/DVI sink device.
>
> The current design adheres to the DSS2 architecture.
>
> It is split into the HDMI DSS driver and HDMI panel driver.
This doesn't apply to my tree. Are you sure it's based on DSS master
branch?
Applying: OMAP4 : DSS2 : Add display type HDMI to DSS2
Applying: OMAP4 : DSS2 : HDMI: Select between HDMI VENC clock source.
Applying: OMAP4 : DSS2 : HDMI: HDMI dispc gamma table disable.
Applying: OMAP4 : DSS2 : HDMI: HDMI driver header file addition
Applying: OMAP4 : DSS2 : HDMI: HDMI driver addition in the DSS
fatal: sha1 information is lacking or useless (drivers/video/omap2/dss/dss.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0005 OMAP4 : DSS2 : HDMI: HDMI driver addition in the DSS
When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --skip".
To restore the original branch and stop patching run "git am -3 --abort".
Tomi
next prev parent reply other threads:[~2011-03-09 14:15 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-09 11:45 [PATCH v4 0/9] OMAP4 : DSS2 : HDMI support on OMAP4 Mythri P K
2011-03-09 11:45 ` [PATCH v4 1/9] OMAP4 : DSS2 : Add display type HDMI to DSS2 Mythri P K
2011-03-09 11:45 ` [PATCH v4 2/9] OMAP4 : DSS2 : HDMI: Select between HDMI VENC clock source Mythri P K
2011-03-09 11:45 ` [PATCH v4 3/9] OMAP4 : DSS2 : HDMI: HDMI dispc gamma table disable Mythri P K
2011-03-09 11:45 ` [PATCH v4 4/9] OMAP4 : DSS2 : HDMI: HDMI driver header file addition Mythri P K
2011-03-09 11:45 ` [PATCH v4 5/9] OMAP4 : DSS2 : HDMI: HDMI driver addition in the DSS Mythri P K
2011-03-09 11:45 ` [PATCH v4 6/9] OMAP4 : DSS2 : HDMI: HDMI panel " Mythri P K
2011-03-09 11:45 ` [PATCH v4 7/9] OMAP4 : DSS : HDMI: Call to HDMI module init to register driver Mythri P K
2011-03-09 11:45 ` [PATCH v4 8/9] OMAP4 : HDMI : Add HDMI structure in the board file for OMAP4 SDP Mythri P K
2011-03-09 11:45 ` [PATCH v4 9/9] OMAP4 : HDMI : Add HDMI structure in the board file for OMAP4 PANDA Mythri P K
2011-03-09 15:54 ` [PATCH v4 7/9] OMAP4 : DSS : HDMI: Call to HDMI module init to register driver Premi, Sanjeev
2011-03-10 5:24 ` K, Mythri P
2011-03-09 14:23 ` [PATCH v4 6/9] OMAP4 : DSS2 : HDMI: HDMI panel driver addition in the DSS Tomi Valkeinen
2011-03-10 5:27 ` K, Mythri P
2011-03-10 7:52 ` Tomi Valkeinen
2011-03-10 9:00 ` K, Mythri P
2011-03-10 9:19 ` Tomi Valkeinen
2011-03-10 9:33 ` K, Mythri P
2011-03-10 9:39 ` Hiremath, Vaibhav
2011-03-10 9:47 ` K, Mythri P
2011-03-10 9:49 ` Tomi Valkeinen
2011-03-09 15:50 ` [PATCH v4 5/9] OMAP4 : DSS2 : HDMI: HDMI " Premi, Sanjeev
2011-03-10 5:22 ` K, Mythri P
2011-03-10 7:57 ` Tomi Valkeinen
2011-03-09 15:56 ` [PATCH v4 4/9] OMAP4 : DSS2 : HDMI: HDMI driver header file addition Premi, Sanjeev
2011-03-10 5:02 ` K, Mythri P
2011-03-10 8:52 ` Premi, Sanjeev
2011-03-10 9:07 ` Tomi Valkeinen
2011-03-09 14:49 ` [PATCH v4 3/9] OMAP4 : DSS2 : HDMI: HDMI dispc gamma table disable Premi, Sanjeev
2011-03-10 5:55 ` K, Mythri P
2011-03-09 14:15 ` Tomi Valkeinen [this message]
2011-03-10 5:27 ` [PATCH v4 0/9] OMAP4 : DSS2 : HDMI support on OMAP4 K, Mythri P
2011-03-10 7:21 ` Tomi Valkeinen
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=1299680106.2151.91.camel@deskari \
--to=tomi.valkeinen@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=mythripk@ti.com \
/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