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

Commit f795a88e authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Greg Kroah-Hartman
Browse files

drm: sun4i: hdmi: Remove extra HPD polling 

[ Upstream commit bda8eaa6dee7525f4dac950810a85a88bf6c2ba0 ]

The HPD sense mechanism in Allwinner's old HDMI encoder hardware is more
or less an input-only GPIO. Other GPIO-based HPD implementations
directly return the current state, instead of polling for a specific
state and returning the other if that times out.

Remove the I/O polling from sun4i_hdmi_connector_detect() and directly
return a known state based on the current reading. This also gets rid
of excessive CPU usage by kworker as reported on Stack Exchange [1] and
Armbian forums [2].

 [1] https://superuser.com/questions/1515001/debian-10-buster-on-cubietruck-with-bug-in-sun4i-drm-hdmi
 [2] https://forum.armbian.com/topic/14282-headless-systems-and-sun4i_drm_hdmi-a10a20/



Fixes: 9c568101 ("drm/sun4i: Add HDMI support")
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200629060032.24134-1-wens@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c84138b3

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+2 −3
Original line number Diff line number Diff line
@@ -262,9 +262,8 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force) 
	struct sun4i_hdmi *hdmi = drm_connector_to_sun4i_hdmi(connector);

	unsigned long reg;



	if (readl_poll_timeout(hdmi->base + SUN4I_HDMI_HPD_REG, reg,

			       reg & SUN4I_HDMI_HPD_HIGH,

			       0, 500000)) {

	reg = readl(hdmi->base + SUN4I_HDMI_HPD_REG);

	if (reg & SUN4I_HDMI_HPD_HIGH) {

		cec_phys_addr_invalidate(hdmi->cec_adap);

		return connector_status_disconnected;

	}