diff options
| author | Vincent Stehlé <v-stehle@ti.com> | 2012-04-30 19:35:07 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-04-30 19:35:07 +0800 |
| commit | 1966a8830284baed7a6a9052787e4a7b502a13bb (patch) | |
| tree | cbbcb931fa2c05c5367692d536d6bb0658b545a2 | |
| parent | bc0f0a5fb4e12a97ed5d778b0d6b324797119574 (diff) | |
Hack! Force HDMI detect & HPDtilt-3.4-omap5-eng-6
Useful with my DELL monitor + HDMI2DVI converter with µEVM.
Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 7 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 8 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c | 4 |
3 files changed, 18 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index a801fb07782..f90020fc38c 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -695,9 +695,14 @@ bool omapdss_hdmi_detect(void) BUG_ON(r); r = 1; - if (hdmi.ip_data.ops->detect) + if (hdmi.ip_data.ops->detect){ r = hdmi.ip_data.ops->detect(&hdmi.ip_data); + // Hack! Force detect. + printk("Hack! Force detect in omapdss_hdmi_detect\n"); + r = 1; + } + hdmi_runtime_put(); mutex_unlock(&hdmi.lock); diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c index 34a77d12246..4b610d60d13 100644 --- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c +++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c @@ -246,6 +246,10 @@ static int hdmi_check_hpd_state(struct hdmi_ip_data *ip_data) pr_err("hdmi_check_hpd_state says %d\n", hpd); + // Hack! Force HPD. + printk("Hack! Force HPD in hdmi_check_hpd_state\n"); + hpd = 1; + if (hpd == ip_data->phy_tx_enabled) { spin_unlock_irqrestore(&phy_tx_lock, flags); return 0; @@ -520,6 +524,10 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data) { + // Hack! Force detect. + printk("Hack! Force detect in ti_hdmi_4xxx_detect\n"); + return 1; + return gpio_get_value(ip_data->hpd_gpio); } diff --git a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c index 77e9cfc98d8..e56198f6de0 100644 --- a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c +++ b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c @@ -272,6 +272,10 @@ int ti_hdmi_5xxx_read_edid(struct hdmi_ip_data *ip_data, bool ti_hdmi_5xxx_detect(struct hdmi_ip_data *ip_data) { + // Hack! + printk("Hack! force detect in ti_hdmi_5xxx_detect\n"); + return 1; + return gpio_get_value(ip_data->hpd_gpio); } |