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

Commit bf03d1b2 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nva3/disp: Fix HDMI audio regression 



This is the nva3 counterpart to commit beba44b1 (drm/nv84/disp: Fix
HDMI audio regression). The regression happened as a result of
refactoring in commit 8e9e3d2d (drm/nv84/disp: move hdmi control into
core).

Reported-and-tested-by: default avatarMax Baldwin <archerseven@gmail.com>
Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
parent 378f2bcd

drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ nva3_hdmi_ctrl(struct nv50_disp_priv *priv, int head, int or, u32 data) 
	nv_wr32(priv, 0x61c510 + soff, 0x00000000);

	nv_mask(priv, 0x61c500 + soff, 0x00000001, 0x00000001);



	nv_mask(priv, 0x61c5d0 + soff, 0x00070001, 0x00010001); /* SPARE, HW_CTS */

	nv_mask(priv, 0x61c568 + soff, 0x00010101, 0x00000000); /* ACR_CTRL, ?? */

	nv_mask(priv, 0x61c578 + soff, 0x80000000, 0x80000000); /* ACR_0441_ENABLE */



	/* ??? */

	nv_mask(priv, 0x61733c, 0x00100000, 0x00100000); /* RESETF */

	nv_mask(priv, 0x61733c, 0x10000000, 0x10000000); /* LOOKUP_EN */