summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-11-11 14:46:00 +0400
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 13:01:32 +0400
commit091e40cd9529968bacbbb18fc05d6dea65421a5b (patch)
tree1d11fe57679b740021d2c88ccdfb7fcc4855f506 /drivers/gpu
parent27517ddbdcc59ab43ed18d7bbe53680d428bbd20 (diff)
downloadlinux-091e40cd9529968bacbbb18fc05d6dea65421a5b.tar.xz
drm/nvd0/disp: enable hdmi audio
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nvd0_display.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index 5d01f1b64e26..75f995852796 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -859,6 +859,9 @@ nvd0_hdmi_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode)
nv_mask(dev, 0x616798 + head, 0x401f007f, 0x40000000 | rekey |
max_ac_packet << 16);
+ /* NFI, audio doesn't work without it though.. */
+ nv_mask(dev, 0x616548 + head, 0x00000070, 0x00000000);
+
nvd0_audio_mode_set(encoder, mode);
}