Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/kms/nv50-: bail from nv50_audio_disable() early if audio not enabled

Browse Source 
Prevents "snd_hda_codec_hdmi hdaudioC1D0: HDMI: pin nid 5 not registered"
that occur on some configurations.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2020-06-17 11:08:41 +10:00
parent dcb7fd82c7
commit 72923e24f9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/dispnv50/disp.c
View File

@ -601,6 +601,9 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
(0x0100 << nv_crtc->index), (0x0100 << nv_crtc->index),
}; };
if (!nv_encoder->audio)
return;
nv_encoder->audio = false; nv_encoder->audio = false;
nvif_mthd(&disp->disp->object, 0, &args, sizeof(args)); nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));