drm/nvd0/disp: enable hdmi audio
authorBen Skeggs <bskeggs@redhat.com>
Fri, 11 Nov 2011 10:46:00 +0000 (20:46 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 21 Dec 2011 09:01:32 +0000 (19:01 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvd0_display.c

index 5d01f1b64e267ab8e2d51acdd6cbfaa34c14c929..75f995852796af7a96b352142f30ad11e6fbb917 100644 (file)
@@ -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);
 }