]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/nouveau/kms: Fix regression by audio component transition
authorTakashi Iwai <tiwai@suse.de>
Thu, 16 Apr 2020 07:54:28 +0000 (09:54 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 22 May 2020 01:13:50 +0000 (11:13 +1000)
commit61a41097e4bd4bf5d4abf3b3b58d5bf0856ce144
tree09a88d1d6d942eb1b853325dda296faf8e66f559
parent0f85bbb6ae517d9a4308527188afe35c2012bbc9
drm/nouveau/kms: Fix regression by audio component transition

Since the commit 742db30c4ee6 ("drm/nouveau: Add HD-audio component
notifier support"), the nouveau driver notifies and pokes the HD-audio
HPD and ELD via audio component, but this seems broken.  The culprit
is the naive assumption that crtc->index corresponds to the HDA pin.
Actually this rather corresponds to the MST dev_id (alias "pipe" in
the audio component framework) while the actual port number is given
from the output ior id number.

This patch corrects the assignment of port and dev_id arguments in the
audio component ops to recover from the HDMI/DP audio regression.

Fixes: 742db30c4ee6 ("drm/nouveau: Add HD-audio component notifier support")
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207223
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/disp.c