Commit 26a2be07 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2020-07-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



 * sun4i: Fix inverted HPD result; fixes an earlier fix
 * lima: fix timeout during reset

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200722070321.GA29190@linux-uq9g
parents ba47d845 f3f90c6d

drivers/gpu/drm/lima/lima_pp.c

+2 −0
Original line number Diff line number Diff line
@@ -271,6 +271,8 @@ void lima_pp_fini(struct lima_ip *ip) 


int lima_pp_bcast_resume(struct lima_ip *ip)

{

	/* PP has been reset by individual PP resume */

	ip->data.async_reset = false;

	return 0;

}

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force) 
	unsigned long reg;



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

	if (reg & SUN4I_HDMI_HPD_HIGH) {

	if (!(reg & SUN4I_HDMI_HPD_HIGH)) {

		cec_phys_addr_invalidate(hdmi->cec_adap);

		return connector_status_disconnected;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE