From 05fff0161aec653771bd39928fbbbed9121e908a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 15 Sep 2014 21:29:05 +1000 Subject: disp/gt214-/dp: enable audio Signed-off-by: Ben Skeggs --- nvkm/engine/disp/hdanva3.c | 15 +++++++++++---- nvkm/engine/disp/hdanvd0.c | 20 ++++++++++++-------- nvkm/engine/disp/hdminvd0.c | 3 --- nvkm/engine/disp/hdminve0.c | 3 --- 4 files changed, 23 insertions(+), 18 deletions(-) (limited to 'nvkm') diff --git a/nvkm/engine/disp/hdanva3.c b/nvkm/engine/disp/hdanva3.c index 8b4e06abe..fe9ef5894 100644 --- a/nvkm/engine/disp/hdanva3.c +++ b/nvkm/engine/disp/hdanva3.c @@ -26,6 +26,8 @@ #include #include +#include + #include "nv50.h" int @@ -46,16 +48,21 @@ nva3_hda_eld(NV50_DISP_MTHD_V1) return ret; if (size && args->v0.data[0]) { + if (outp->info.type == DCB_OUTPUT_DP) { + nv_mask(priv, 0x61c1e0 + soff, 0x8000000d, 0x80000001); + nv_wait(priv, 0x61c1e0 + soff, 0x80000000, 0x00000000); + } for (i = 0; i < size; i++) nv_wr32(priv, 0x61c440 + soff, (i << 8) | args->v0.data[0]); for (; i < 0x60; i++) nv_wr32(priv, 0x61c440 + soff, (i << 8)); nv_mask(priv, 0x61c448 + soff, 0x80000003, 0x80000003); - } else - if (size) { - nv_mask(priv, 0x61c448 + soff, 0x80000003, 0x80000001); } else { - nv_mask(priv, 0x61c448 + soff, 0x80000003, 0x80000000); + if (outp->info.type == DCB_OUTPUT_DP) { + nv_mask(priv, 0x61c1e0 + soff, 0x80000001, 0x80000000); + nv_wait(priv, 0x61c1e0 + soff, 0x80000000, 0x00000000); + } + nv_mask(priv, 0x61c448 + soff, 0x80000003, 0x80000000 | !!size); } return 0; diff --git a/nvkm/engine/disp/hdanvd0.c b/nvkm/engine/disp/hdanvd0.c index baf558fc1..1d4e8432d 100644 --- a/nvkm/engine/disp/hdanvd0.c +++ b/nvkm/engine/disp/hdanvd0.c @@ -26,10 +26,7 @@ #include #include -#include -#include -#include -#include +#include #include "nv50.h" @@ -40,6 +37,7 @@ nvd0_hda_eld(NV50_DISP_MTHD_V1) struct nv50_disp_sor_hda_eld_v0 v0; } *args = data; const u32 soff = outp->or * 0x030; + const u32 hoff = head * 0x800; int ret, i; nv_ioctl(object, "disp sor hda eld size %d\n", size); @@ -51,16 +49,22 @@ nvd0_hda_eld(NV50_DISP_MTHD_V1) return ret; if (size && args->v0.data[0]) { + if (outp->info.type == DCB_OUTPUT_DP) { + nv_mask(priv, 0x616618 + hoff, 0x8000000c, 0x80000001); + nv_wait(priv, 0x616618 + hoff, 0x80000000, 0x00000000); + } + nv_mask(priv, 0x616548 + hoff, 0x00000070, 0x00000000); for (i = 0; i < size; i++) nv_wr32(priv, 0x10ec00 + soff, (i << 8) | args->v0.data[i]); for (; i < 0x60; i++) nv_wr32(priv, 0x10ec00 + soff, (i << 8)); nv_mask(priv, 0x10ec10 + soff, 0x80000003, 0x80000003); - } else - if (size) { - nv_mask(priv, 0x10ec10 + soff, 0x80000003, 0x80000001); } else { - nv_mask(priv, 0x10ec10 + soff, 0x80000003, 0x80000000); + if (outp->info.type == DCB_OUTPUT_DP) { + nv_mask(priv, 0x616618 + hoff, 0x80000001, 0x80000000); + nv_wait(priv, 0x616618 + hoff, 0x80000000, 0x00000000); + } + nv_mask(priv, 0x10ec10 + soff, 0x80000003, 0x80000000 | !!size); } return 0; diff --git a/nvkm/engine/disp/hdminvd0.c b/nvkm/engine/disp/hdminvd0.c index 3106d295b..bac4fc457 100644 --- a/nvkm/engine/disp/hdminvd0.c +++ b/nvkm/engine/disp/hdminvd0.c @@ -75,8 +75,5 @@ nvd0_hdmi_ctrl(NV50_DISP_MTHD_V1) /* HDMI_CTRL */ nv_mask(priv, 0x616798 + hoff, 0x401f007f, ctrl); - - /* NFI, audio doesn't work without it though.. */ - nv_mask(priv, 0x616548 + hoff, 0x00000070, 0x00000000); return 0; } diff --git a/nvkm/engine/disp/hdminve0.c b/nvkm/engine/disp/hdminve0.c index 7bf632a3c..528d14ec2 100644 --- a/nvkm/engine/disp/hdminve0.c +++ b/nvkm/engine/disp/hdminve0.c @@ -79,8 +79,5 @@ nve0_hdmi_ctrl(NV50_DISP_MTHD_V1) /* HDMI_CTRL */ nv_mask(priv, 0x616798 + hoff, 0x401f007f, ctrl); - - /* NFI, audio doesn't work without it though.. */ - nv_mask(priv, 0x616548 + hoff, 0x00000070, 0x00000000); return 0; } -- cgit v1.2.1