summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorsumit <sumit@wintermute.am.dhcp.ti.com>2009-11-10 19:46:04 -0600
committerSantosh Shilimkar <santosh.shilimkar@ti.com>2009-11-11 08:14:58 +0530
commit798fbae1f49fea8b3d02dee3b190a92317d5d0bf (patch)
tree3e706e5b2d786f20a05583a3d24fc8ed54be664d /drivers
parent090d20642b2c1dd428bd5ad194f98558949a9c6c (diff)
OMAP4: HDMI/DISPC: Updated fifo calculations to enable 1080p on video pipelines. Signed-off-by: Yong Zhi <y-zhi@ti.com>, Sumit Semwal <sumit.semwal@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/hdmi.c1
-rw-r--r--drivers/video/omap2/dss/manager.c9
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index ae2bf12c4330..1dc5e4990ffd 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -545,7 +545,6 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
/* these settings are independent of overlays */
dss_switch_tv_hdmi(1);
- dispc_set_loadmode(OMAP_DSS_LOAD_CLUT_AND_FRAME);
/* bypass TV gamma table*/
dispc_enable_gamma_table(0);
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 7116c235bdcc..428f8e1863d2 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -846,9 +846,6 @@ static int configure_overlay(enum omap_plane plane)
}
dispc_enable_replication(plane, c->replication);
-#ifdef CONFIG_OMAP2_DSS_HDMI
- dispc_enable_preload(plane, 1); /* ZeBu hdmi test */
-#endif
dispc_set_burst_size(plane, c->burst_size);
dispc_setup_plane_fifo(plane, c->fifo_low, c->fifo_high);
@@ -1328,15 +1325,11 @@ 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);
break;
- case OMAP_DISPLAY_TYPE_HDMI:
- oc->burst_size = 2; /* DISPC_BURST_8X128*/
- oc->fifo_low = 0xf0;
- oc->fifo_high = 0xfc;
- break;
#ifdef CONFIG_OMAP2_DSS_DSI
case OMAP_DISPLAY_TYPE_DSI:
dsi_get_overlay_fifo_thresholds(ovl->id, size,