mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

* sun4i: Fix inverted HPD result; fixes an earlier fix

Browse source 
* lima: fix timeout during reset
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAl8X5D4ACgkQaA3BHVML
 eiMS6ggAh7doQciXKyJDtpa1zIcsvwoejknkGu45dmzqTE/dVD0LLLzX1HOUMUY4
 TjUVitUx+S4A8BH1FuU+/IA9VVqIJ5lu7FBszuF4K0UJy78WVXHIEgrD/MsaukHy
 6pBEaU39KMSk4D3GgpTYfeGfzkRaTpmXRcxADzwtQs+nOZu6rdHa0jkst1B20UEP
 y7sT0OTQRYLno/iVMCYIX2OOrlq5UgwGosXNEXoKd6YWmhnIvSeE/zpVFPnIpW1C
 0aPsc+gByHyg+dvto2M52xHg2QbM2aBVA7sLLpDxpL8O604k2lrlCA2TPoI9UkiP
 GZezSn9KPmMXNBtbCGaCw+7SHg6hkA==
 =rXN2
 -----END PGP SIGNATURE-----

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: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200722070321.GA29190@linux-uq9g
This commit is contained in:
Dave Airlie 2020-07-23 14:05:28 +10:00
commit 26a2be0789
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/lima/lima_pp.c
View file

@ -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;
}

2
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
View file

@ -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;
}