diff options
| author | Roger Quadros <rogerq@ti.com> | 2012-09-25 18:02:44 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-09-25 20:23:20 +0200 |
| commit | f05eba1de822cafce0e247af6ec45687253a4cd3 (patch) | |
| tree | a298ff25c26051a1108d352135d2f86db296a91e /drivers | |
| parent | 47f2ab752f16b0797a328546172bff04bc0f2614 (diff) | |
OMAPDSS: Fix HDMI/DVI detection
If we want to detect HPD without enabling the display then
we need to set the hpd_gpio data in probe instead of in hdmi_enable
Signed-off-by: Roger Quadros <rogerq@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 575ebddd5456..b66bfa4e8b18 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -691,7 +691,6 @@ bool omapdss_hdmi_detect(void) int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev) { - struct omap_dss_hdmi_data *priv = dssdev->data; int r = 0; DSSDBG("ENTER hdmi_display_enable\n"); @@ -704,8 +703,6 @@ int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev) goto err0; } - hdmi.ip_data.hpd_gpio = priv->hpd_gpio; - r = omap_dss_start_device(dssdev); if (r) { DSSERR("failed to start device\n"); @@ -973,10 +970,13 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev) for (i = 0; i < pdata->num_devices; ++i) { struct omap_dss_device *dssdev = pdata->devices[i]; + struct omap_dss_hdmi_data *priv = dssdev->data; if (dssdev->type != OMAP_DISPLAY_TYPE_HDMI) continue; + hdmi.ip_data.hpd_gpio = priv->hpd_gpio; + r = hdmi_init_display(dssdev); if (r) { DSSERR("device %s init failed: %d\n", dssdev->name, r); |