diff options
| author | Andy Green <andy.green@linaro.org> | 2012-06-20 15:37:13 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-21 07:31:30 +0800 |
| commit | 2ddbfd7f17ebe7a903f36afcebaa458e690abe4d (patch) | |
| tree | b0e88ccb94bda1e5a8bd6f7e3fb34989e5f9a381 | |
| parent | 7a5a490219346f213a32d191a2a8d89e690367c9 (diff) | |
debug
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index 11bfa9b1091..4f27068407f 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c @@ -669,6 +669,7 @@ static const struct omap_dss_features omap5_dss_features = { .overlay_caps = omap4_dss_overlay_caps, .clksrc_names = omap5_dss_clk_source_names, .dss_params = omap5_dss_param_range, + .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER, .buffer_size_unit = 16, .burst_size_unit = 16, .dsi_ddr_div = 2, @@ -714,6 +715,7 @@ static const struct ti_hdmi_ip_ops omap5_hdmi_functions = { .pll_enable = ti_hdmi_4xxx_pll_enable, .pll_disable = ti_hdmi_4xxx_pll_disable, .video_enable = ti_hdmi_4xxx_wp_video_start, + .video_disable = ti_hdmi_4xxx_wp_video_stop, .irq_handler = ti_hdmi_4xxx_irq_handler, .irq_process = ti_hdmi_5xxx_irq_process, .configure_range = ti_hdmi_5xxx_configure_range, diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index ea31289823e..fe0719f7772 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -627,7 +627,8 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev) dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings); } - // omapdss_hdmi_display_enable(dssdev); +// if (cpu_is_omap54xx()) + // omapdss_hdmi_display_enable(dssdev); } static void hdmi_dump_regs(struct seq_file *s) diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c index a777b55489a..b247e341e5c 100644 --- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c +++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c @@ -349,8 +349,8 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data) IRQF_ONESHOT, "hpd", ip_data); if (r) { DSSERR("HPD IRQ request failed\n"); - hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF); - return r; +// hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF); +// return r; } r = hdmi_check_hpd_state(ip_data); |