diff options
| author |   Ilia Mirkin <imirkin@alum.mit.edu> | 2013-07-28 22:30:57 -0400 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2013-07-30 13:04:38 +1000 |
| commit | 02d69294a174d7cb6a76080b6d16971ca08728d4 (patch) | |
| tree | 14e7dbec1fb02e99439bd5b2c1e5315104a60516 /drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c | |
| parent | drm/nv31/mpeg: fix mpeg engine initialization (diff) | |
| download | linux-dev-02d69294a174d7cb6a76080b6d16971ca08728d4.tar.xz linux-dev-02d69294a174d7cb6a76080b6d16971ca08728d4.zip | |
drm/nva3-/disp: fix hda eld writing, needs to be padded
Commits 0a9e2b959 (drm/nvd0/disp: move HDA codec setup to core) and
a4feaf4ea (drm/nva3/disp: move hda codec handling to core) moved code
around but neglected to fill data up to 0x60 as before. This caused
/proc/asound/cardN/eld#3.0 to show eld_valid as 0. With this patch, that
file is again populated with the correct data.
See https://bugs.freedesktop.org/show_bug.cgi?id=67051
Reported-and-tested-by: Alex <alupu01@gmail.com>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c index dc57e24fc1df..717639386ced 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c @@ -41,6 +41,8 @@ nvd0_hda_eld(struct nv50_disp_priv *priv, int or, u8 *data, u32 size) if (data && data[0]) { for (i = 0; i < size; i++) nv_wr32(priv, 0x10ec00 + soff, (i << 8) | data[i]); + for (; i < 0x60; i++) + nv_wr32(priv, 0x10ec00 + soff, (i << 8)); nv_mask(priv, 0x10ec10 + soff, 0x80000003, 0x80000003); } else if (data) { |