diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-09-15 07:20:47 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-09-15 14:25:16 +0200 |
| commit | 3eee8646c119db9c12f4fe66dc275093abd84555 (patch) | |
| tree | fabe13627082d2b228c7c4cadc3b216cfcaf1fe9 /drivers/gpu/drm/nouveau | |
| parent | drm/gk104-/disp: infoframe registers moved yet again on kepler (diff) | |
| download | linux-3eee8646c119db9c12f4fe66dc275093abd84555.tar.xz linux-3eee8646c119db9c12f4fe66dc275093abd84555.zip | |
drm/gt214-/kms: perform hda codec setup on displayport too
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index c15060e7336c..e759381450ef 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -1750,8 +1750,6 @@ nv50_hdmi_disconnect(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) (0x0100 << nv_crtc->index), }; - nv50_audio_disconnect(encoder); - nvif_mthd(disp->disp, 0, &args, sizeof(args)); } @@ -1860,6 +1858,7 @@ nv50_sor_disconnect(struct drm_encoder *encoder) if (nv_crtc) { nv50_crtc_prepare(&nv_crtc->base); nv50_sor_ctrl(nv_encoder, 1 << nv_crtc->index, 0); + nv50_audio_disconnect(encoder); nv50_hdmi_disconnect(&nv_encoder->base.base, nv_crtc); } } @@ -1959,6 +1958,7 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode, proto = 0x8; else proto = 0x9; + nv50_audio_mode_set(encoder, mode); break; default: BUG_ON(1); |