openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/gt214-/kms: perform hda codec setup on displayport too 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2014-09-15 15:20:47 +10:00
parent a522946174
commit 3eee8646c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/nv50_display.c
View File

@ -1750,8 +1750,6 @@ nv50_hdmi_disconnect(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
(0x0100 << nv_crtc->index), (0x0100 << nv_crtc->index),
}; };
nv50_audio_disconnect(encoder);
nvif_mthd(disp->disp, 0, &args, sizeof(args)); nvif_mthd(disp->disp, 0, &args, sizeof(args));
} }
@ -1860,6 +1858,7 @@ nv50_sor_disconnect(struct drm_encoder *encoder)
if (nv_crtc) { if (nv_crtc) {
nv50_crtc_prepare(&nv_crtc->base); nv50_crtc_prepare(&nv_crtc->base);
nv50_sor_ctrl(nv_encoder, 1 << nv_crtc->index, 0); nv50_sor_ctrl(nv_encoder, 1 << nv_crtc->index, 0);
nv50_audio_disconnect(encoder);
nv50_hdmi_disconnect(&nv_encoder->base.base, nv_crtc); 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; proto = 0x8;
else else
proto = 0x9; proto = 0x9;
nv50_audio_mode_set(encoder, mode);
break; break;
default: default:
BUG_ON(1); BUG_ON(1);