Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca888a79 authored by Rob Clark's avatar Rob Clark Committed by Tomi Valkeinen
Browse files

OMAPDSS: HDMI: hot plug detect fix 



The "OMAPDSS: HDMI: PHY burnout fix" commit switched the HDMI driver
over to using a GPIO for plug detect.  Unfortunately the ->detect()
method was not also updated, causing HDMI to no longer work for the
omapdrm driver (because it would actually check if a connection was
detected before attempting to enable display).

Signed-off-by: default avatarRob Clark <rob@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent a247ce78

drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -479,14 +479,7 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, 




bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data)

bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data)

{

{

	int r;

	return gpio_get_value(ip_data->hpd_gpio);



	void __iomem *base = hdmi_core_sys_base(ip_data);



	/* HPD */

	r = REG_GET(base, HDMI_CORE_SYS_SYS_STAT, 1, 1);



	return r == 1;

}

}





static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,

static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,