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

airlied · airlied · commit 26a2be0789a7 · 2020-07-23T14:05:33.000+10:00
* sun4i: Fix inverted HPD result; fixes an earlier fix * lima: fix timeout during reset Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20200722070321.GA29190@linux-uq9g
diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c
@@ -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;
 }
 
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,8 @@ void lima_pp_fini(struct lima_ip *ip)`
`271`	`271`
`272`	`272`	`int lima_pp_bcast_resume(struct lima_ip *ip)`
`273`	`273`	`{`
	`274`	`+ /* PP has been reset by individual PP resume */`
	`275`	`+ ip->data.async_reset = false;`
`274`	`276`	`return 0;`
`275`	`277`	`}`
`276`	`278`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force)`
`260`	`260`	`unsigned long reg;`
`261`	`261`
`262`	`262`	`reg = readl(hdmi->base + SUN4I_HDMI_HPD_REG);`
`263`		`- if (reg & SUN4I_HDMI_HPD_HIGH) {`
	`263`	`+ if (!(reg & SUN4I_HDMI_HPD_HIGH)) {`
`264`	`264`	`cec_phys_addr_invalidate(hdmi->cec_adap);`
`265`	`265`	`return connector_status_disconnected;`
`266`	`266`	`}`