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

Submitted by Alastair Bridgewater on Jan. 11, 2017, 8:47 p.m.

Details

Message ID 20170111204718.6138-1-alastair.bridgewater@gmail.com
State New
Headers show
Series "drm/nouveau: Fix HDA ELD handling (thus, HDMI audio) on gt215" ( rev: 1 ) in Nouveau

Not browsing as part of any series.

Commit Message

Alastair Bridgewater Jan. 11, 2017, 8:47 p.m.
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>
---
 drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
index 6f0436d..f8f2f16 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
+++ b/drivers/gpu/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);

Comments

On Wed, Jan 11, 2017 at 3:47 PM, Alastair Bridgewater
<alastair.bridgewater@gmail.com> wrote:
> 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>

Great find! Here are some more tags:

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>

> ---
>  drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
> index 6f0436d..f8f2f16 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
> +++ b/drivers/gpu/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);
> --
> 2.10.2
>
> _______________________________________________
> Nouveau mailing list
> Nouveau@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau