From: Mythri P K <mythripk@ti.com>
To: linux-omap@vger.kernel.org, tomi.valkeinen@ti.com
Cc: Mythri P K <mythripk@ti.com>
Subject: [PATCH v5 01/10] OMAP4 : DSS2 : Add display type HDMI to DSS2
Date: Thu, 10 Mar 2011 16:14:09 +0530 [thread overview]
Message-ID: <1299753858-12222-2-git-send-email-mythripk@ti.com> (raw)
In-Reply-To: <1299753858-12222-1-git-send-email-mythripk@ti.com>
Adding HDMI type in dss_features , overlay and
the manager so that HDMI type of display will be recognized.
Signed-off-by: Mythri P K <mythripk@ti.com>
---
arch/arm/plat-omap/include/plat/display.h | 1 +
drivers/video/omap2/dss/display.c | 2 ++
drivers/video/omap2/dss/dss_features.c | 2 +-
drivers/video/omap2/dss/manager.c | 9 +++++++--
drivers/video/omap2/dss/overlay.c | 6 ++++--
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
index e81ca66..5e04ddc 100644
--- a/arch/arm/plat-omap/include/plat/display.h
+++ b/arch/arm/plat-omap/include/plat/display.h
@@ -58,6 +58,7 @@ enum omap_display_type {
OMAP_DISPLAY_TYPE_SDI = 1 << 2,
OMAP_DISPLAY_TYPE_DSI = 1 << 3,
OMAP_DISPLAY_TYPE_VENC = 1 << 4,
+ OMAP_DISPLAY_TYPE_HDMI = 1 << 5,
};
enum omap_plane {
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 7d96b72..c40bcbd 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -342,6 +342,7 @@ int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev)
return 16;
case OMAP_DISPLAY_TYPE_VENC:
case OMAP_DISPLAY_TYPE_SDI:
+ case OMAP_DISPLAY_TYPE_HDMI:
return 24;
default:
BUG();
@@ -368,6 +369,7 @@ bool dss_use_replication(struct omap_dss_device *dssdev,
case OMAP_DISPLAY_TYPE_DPI:
bpp = dssdev->phy.dpi.data_lines;
break;
+ case OMAP_DISPLAY_TYPE_HDMI:
case OMAP_DISPLAY_TYPE_VENC:
case OMAP_DISPLAY_TYPE_SDI:
bpp = 24;
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index 6eb6ec6..86dc848 100644
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -115,7 +115,7 @@ static const enum omap_display_type omap4_dss_supported_displays[] = {
OMAP_DISPLAY_TYPE_DBI | OMAP_DISPLAY_TYPE_DSI,
/* OMAP_DSS_CHANNEL_DIGIT */
- OMAP_DISPLAY_TYPE_VENC,
+ OMAP_DISPLAY_TYPE_VENC | OMAP_DISPLAY_TYPE_HDMI,
/* OMAP_DSS_CHANNEL_LCD2 */
OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 1f53bf2..bcd37ec 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -515,6 +515,8 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC) {
irq = DISPC_IRQ_EVSYNC_ODD;
+ } else if (mgr->device->type == OMAP_DISPLAY_TYPE_HDMI) {
+ irq = DISPC_IRQ_EVSYNC_EVEN;
} else {
if (mgr->id == OMAP_DSS_CHANNEL_LCD)
irq = DISPC_IRQ_VSYNC;
@@ -536,7 +538,8 @@ static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
return 0;
- if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
+ if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
+ || dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
} else {
if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
@@ -613,7 +616,8 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
return 0;
- if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
+ if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
+ || dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
} else {
if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
@@ -1377,6 +1381,7 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
case OMAP_DISPLAY_TYPE_DBI:
case OMAP_DISPLAY_TYPE_SDI:
case OMAP_DISPLAY_TYPE_VENC:
+ case OMAP_DISPLAY_TYPE_HDMI:
default_get_overlay_fifo_thresholds(ovl->id, size,
&oc->burst_size, &oc->fifo_low,
&oc->fifo_high);
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
index 996e9a4..f1aca6d 100644
--- a/drivers/video/omap2/dss/overlay.c
+++ b/drivers/video/omap2/dss/overlay.c
@@ -679,7 +679,8 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
lcd2_mgr->set_device(lcd2_mgr, dssdev);
mgr = lcd2_mgr;
}
- } else if (dssdev->type != OMAP_DISPLAY_TYPE_VENC) {
+ } else if (dssdev->type != OMAP_DISPLAY_TYPE_VENC
+ && dssdev->type != OMAP_DISPLAY_TYPE_HDMI) {
if (!lcd_mgr->device || force) {
if (lcd_mgr->device)
lcd_mgr->unset_device(lcd_mgr);
@@ -688,7 +689,8 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
}
}
- if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
+ if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
+ || dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
if (!tv_mgr->device || force) {
if (tv_mgr->device)
tv_mgr->unset_device(tv_mgr);
--
1.5.6.3
next prev parent reply other threads:[~2011-03-10 10:50 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 10:44 [PATCH v5 00/10] OMAP4 : DSS2 : HDMI support on OMAP4 Mythri P K
2011-03-10 10:44 ` Mythri P K [this message]
2011-03-10 10:44 ` [PATCH v5 02/10] OMAP4 : DSS2 : HDMI: Select between HDMI VENC clock source Mythri P K
2011-03-10 10:44 ` [PATCH v5 03/10] OMAP4 : DSS2 : HDMI: Dispc gamma enable set/reset function for TV Mythri P K
2011-03-10 10:44 ` [PATCH v5 04/10] OMAP4 : DSS2 : HDMI: HDMI driver header file addition Mythri P K
2011-03-10 10:44 ` [PATCH v5 05/10] OMAP4 : DSS2 : HDMI: HDMI driver addition in the DSS Mythri P K
2011-03-10 10:44 ` [PATCH v5 06/10] OMAP4 : DSS2 : HDMI: HDMI panel " Mythri P K
2011-03-10 10:44 ` [PATCH v5 07/10] OMAP4 : DSS2 : HDMI: Add makefile and kconfig changes to enable HDMI in OMAP4 Mythri P K
2011-03-10 10:44 ` [PATCH v5 08/10] OMAP4 : DSS : HDMI: Call to HDMI module init to register driver Mythri P K
2011-03-10 10:44 ` [PATCH v5 09/10] OMAP4 : HDMI : Add HDMI structure in the board file for OMAP4 SDP Mythri P K
2011-03-10 10:44 ` [PATCH v5 10/10] OMAP4 : HDMI : Add HDMI structure in the board file for OMAP4 PANDA Mythri P K
2011-03-15 4:23 ` Tomi Valkeinen
2011-03-15 14:47 ` John S
2011-03-10 14:04 ` [PATCH v5 08/10] OMAP4 : DSS : HDMI: Call to HDMI module init to register driver Tomi Valkeinen
2011-03-10 13:59 ` [PATCH v5 07/10] OMAP4 : DSS2 : HDMI: Add makefile and kconfig changes to enable HDMI in OMAP4 Tomi Valkeinen
2011-03-10 13:58 ` [PATCH v5 05/10] OMAP4 : DSS2 : HDMI: HDMI driver addition in the DSS Tomi Valkeinen
2011-03-10 13:52 ` [PATCH v5 03/10] OMAP4 : DSS2 : HDMI: Dispc gamma enable set/reset function for TV Tomi Valkeinen
2011-05-05 13:50 ` Laurent Pinchart
2011-03-10 13:49 ` [PATCH v5 02/10] OMAP4 : DSS2 : HDMI: Select between HDMI VENC clock source Tomi Valkeinen
2011-03-10 13:48 ` [PATCH v5 01/10] OMAP4 : DSS2 : Add display type HDMI to DSS2 Tomi Valkeinen
2011-03-10 16:53 ` Aaro Koskinen
2011-03-10 13:44 ` [PATCH v5 00/10] OMAP4 : DSS2 : HDMI support on OMAP4 Tomi Valkeinen
2011-03-10 14:45 ` Stephan Raue
2011-03-10 14:51 ` Tomi Valkeinen
2011-03-11 0:07 ` Stephan Raue
2011-03-11 6:16 ` K, Mythri P
2011-03-11 7:24 ` Tomi Valkeinen
2011-03-11 13:23 ` Hiremath, Vaibhav
2011-03-14 8:35 ` Hiremath, Vaibhav
2011-03-14 9:24 ` Tomi Valkeinen
2011-03-14 9:35 ` Hiremath, Vaibhav
2011-03-16 6:45 ` Tomi Valkeinen
2011-03-16 6:47 ` Hiremath, Vaibhav
2011-03-11 7:12 ` Tomi Valkeinen
2011-03-11 8:43 ` Stephan Raue
2011-03-11 13:22 ` Tomi Valkeinen
2011-03-11 16:18 ` Stephan Raue
2011-03-11 18:27 ` Tomi Valkeinen
2011-03-11 18:42 ` Stephan Raue
2011-03-12 6:51 ` K, Mythri P
2011-03-13 14:32 ` Stephan Raue
2011-03-13 16:20 ` Stephan Raue
2011-03-16 6:51 ` Tomi Valkeinen
2011-03-16 10:53 ` K, Mythri P
2011-03-16 10:59 ` Tomi Valkeinen
2011-03-16 23:49 ` Stephan Raue
2011-03-17 11:11 ` Tomi Valkeinen
2011-03-17 16:20 ` Janorkar, Mayuresh
2011-03-17 20:16 ` Stephan Raue
2011-03-17 21:13 ` Stephan Raue
2011-03-17 21:34 ` Stephan Raue
2011-03-18 3:45 ` Tomi Valkeinen
2011-03-18 5:43 ` Anand Gadiyar
2011-03-18 6:17 ` Gadiyar, Anand
2011-03-18 5:43 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-18 5:52 ` Anand Gadiyar
2011-03-14 10:37 ` Jan, Sebastien
2011-03-15 4:06 ` Tomi Valkeinen
2011-03-15 4:38 ` K, Mythri P
2011-03-10 15:06 ` Tomi Valkeinen
2011-03-11 8:24 ` K, Mythri P
2011-03-16 8:32 ` 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=1299753858-12222-2-git-send-email-mythripk@ti.com \
--to=mythripk@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=tomi.valkeinen@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;
as well as URLs for NNTP newsgroup(s).