diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-18 19:45:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 07:33:33 -0700 |
| commit | 2ba6a660925b2d01ff8bf70c7bc0e5b131ddd6fe (patch) | |
| tree | 8a18b525650464e4e7a15bddae91ea872fc7ba30 /sound | |
| parent | 4cda9ceeb71eed24a4e641481740333853b53e9f (diff) | |
| download | lwn-2ba6a660925b2d01ff8bf70c7bc0e5b131ddd6fe.tar.gz lwn-2ba6a660925b2d01ff8bf70c7bc0e5b131ddd6fe.zip | |
ALSA: hda - Fix spurious kernel WARNING on Baytrail HDMI
commit 93a9ff151754fbdf951b1b993bcf96453f6e36b3 upstream.
snd_hdac_sync_audio_rate() call is mandatory only for HSW and later
models, but we call the function unconditionally blindly assuming that
the function doesn't do anything harmful. But since recently, the
function checks the validity of the passed pin NID, and eventually
spews the warning if an unexpected pin is passed. This is seen on old
chips like Baytrail.
The fix is to limit the call of this function again only for the chips
with the proper binding. This can be identified by the same flag as
the eld notifier.
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index cbe32d0929d3..23b74037597c 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1873,7 +1873,8 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, /* Call sync_audio_rate to set the N/CTS/M manually if necessary */ /* Todo: add DP1.2 MST audio support later */ - snd_hdac_sync_audio_rate(&codec->bus->core, pin_nid, runtime->rate); + if (codec_has_acomp(codec)) + snd_hdac_sync_audio_rate(&codec->bus->core, pin_nid, runtime->rate); non_pcm = check_non_pcm_per_cvt(codec, cvt_nid); mutex_lock(&per_pin->lock); |