Skip to content

Commit 72923e2

Browse files
author
Ben Skeggs
committed
drm/nouveau/kms/nv50-: bail from nv50_audio_disable() early if audio not enabled
Prevents "snd_hda_codec_hdmi hdaudioC1D0: HDMI: pin nid 5 not registered" that occur on some configurations. Signed-off-by: Ben Skeggs <[email protected]>
1 parent dcb7fd8 commit 72923e2

File tree

1 file changed

+3
-0
lines changed
  • drivers/gpu/drm/nouveau/dispnv50

1 file changed

+3
-0
lines changed

drivers/gpu/drm/nouveau/dispnv50/disp.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,9 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
601601
(0x0100 << nv_crtc->index),
602602
};
603603

604+
if (!nv_encoder->audio)
605+
return;
606+
604607
nv_encoder->audio = false;
605608
nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));
606609

0 commit comments

Comments
 (0)