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

Commit 2a3797ef authored by Alastair Bridgewater's avatar Alastair Bridgewater Committed by Greg Kroah-Hartman
Browse files

drm/nouveau/disp/gt215: Fix HDA ELD handling (thus, HDMI audio) on gt215 



commit d347583a39e2df609a9e40c835f72d3614665b53 upstream.

Store the ELD correctly, not just enough copies of the first byte
to pad out the given ELD size.

Signed-off-by: default avatarAlastair Bridgewater <alastair.bridgewater@gmail.com>
Fixes: 120b0c39 ("drm/nv50-/disp: audit and version SOR_HDA_ELD method")
Reviewed-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e21a3cad

drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ gt215_hda_eld(NV50_DISP_MTHD_V1) 
			);

		}

		for (i = 0; i < size; i++)

			nvkm_wr32(device, 0x61c440 + soff, (i << 8) | args->v0.data[0]);

			nvkm_wr32(device, 0x61c440 + soff, (i << 8) | args->v0.data[i]);

		for (; i < 0x60; i++)

			nvkm_wr32(device, 0x61c440 + soff, (i << 8));

		nvkm_mask(device, 0x61c448 + soff, 0x80000003, 0x80000003);