From 54bd915c6e5d58a26092eb8c2f1ad4944e26003a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 11 Nov 2011 20:46:00 +1000 Subject: [PATCH] --- yaml --- r: 282619 b: refs/heads/master c: 091e40cd9529968bacbbb18fc05d6dea65421a5b h: refs/heads/master i: 282617: e0d9d1021bd7ba51d6844a9183a2b09b672f3206 282615: 12e43568cb3f3b7e337ad84a2b9a229676ed5ab7 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nvd0_display.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 539ac215fc78..3fd16fc7f2dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27517ddbdcc59ab43ed18d7bbe53680d428bbd20 +refs/heads/master: 091e40cd9529968bacbbb18fc05d6dea65421a5b diff --git a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c index 5d01f1b64e26..75f995852796 100644 --- a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c +++ b/trunk/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); }