diff options
| author | Alastair Bridgewater <alastair.bridgewater@gmail.com> | 2017-01-11 15:47:18 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-01-31 19:53:04 +1000 |
| commit | 01f6373a8e24bd20fa9a09758abdf4322808a64b (patch) | |
| tree | 8d59964ad19172e01cb94f7abf1118f600cb51b3 | |
| parent | 774b94348e0df628a851174864154c9c1780d98a (diff) | |
| download | nouveau-01f6373a8e24bd20fa9a09758abdf4322808a64b.tar.gz | |
disp/gt215: Fix HDA ELD handling (thus, HDMI audio) on gt215
Store the ELD correctly, not just enough copies of the first byte
to pad out the given ELD size.
Signed-off-by: Alastair Bridgewater <alastair.bridgewater@gmail.com>
Fixes: 120b0c39c756 ("drm/nv50-/disp: audit and version SOR_HDA_ELD method")
Cc: stable@vger.kernel.org # v3.17+
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/nvkm/engine/disp/hdagt215.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/nvkm/engine/disp/hdagt215.c b/drm/nouveau/nvkm/engine/disp/hdagt215.c index 6f0436df0..f8f2f16c2 100644 --- a/drm/nouveau/nvkm/engine/disp/hdagt215.c +++ b/drm/nouveau/nvkm/engine/disp/hdagt215.c @@ -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); |