mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-22 10:31:08 +00:00
ffc6d45d96
Starting in commitcbc7a6b5a8("ASoC: soc-card: add snd_soc_card_add_dai_link()"), error value from ASoc add_dai_link() is no longer ignored. The generic HDA machine driver relied on the old semantics to disable i915 HDMI/DP audio codec at runtime. If no display codec was present, add_dai_link() returned an error, but this was ignored and rest of the card was successfully probed. Fix the problem by changing the machine driver add_dai_link() to not return an error in this case. Fixes:cbc7a6b5a8("ASoC: soc-card: add snd_soc_card_add_dai_link()") Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Rander Wang <rander.wang@linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> BugLink: https://github.com/thesofproject/linux/issues/2261 Link: https://lore.kernel.org/r/20200714132804.3638221-1-kai.vehmanen@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
66 lines
1.6 KiB
C
66 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright(c) 2015-18 Intel Corporation.
|
|
*/
|
|
|
|
/*
|
|
* This file defines data structures used in Machine Driver for Intel
|
|
* platforms with HDA Codecs.
|
|
*/
|
|
|
|
#ifndef __SKL_HDA_DSP_COMMON_H
|
|
#define __SKL_HDA_DSP_COMMON_H
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <sound/core.h>
|
|
#include <sound/jack.h>
|
|
#include <sound/hda_codec.h>
|
|
#include "../../codecs/hdac_hda.h"
|
|
#include "hda_dsp_common.h"
|
|
|
|
#define HDA_DSP_MAX_BE_DAI_LINKS 7
|
|
|
|
struct skl_hda_hdmi_pcm {
|
|
struct list_head head;
|
|
struct snd_soc_dai *codec_dai;
|
|
struct snd_soc_jack hdmi_jack;
|
|
int device;
|
|
};
|
|
|
|
struct skl_hda_private {
|
|
struct list_head hdmi_pcm_list;
|
|
int pcm_count;
|
|
int dai_index;
|
|
const char *platform_name;
|
|
bool common_hdmi_codec_drv;
|
|
bool idisp_codec;
|
|
};
|
|
|
|
extern struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS];
|
|
int skl_hda_hdmi_jack_init(struct snd_soc_card *card);
|
|
int skl_hda_hdmi_add_pcm(struct snd_soc_card *card, int device);
|
|
|
|
/*
|
|
* Search card topology and register HDMI PCM related controls
|
|
* to codec driver.
|
|
*/
|
|
static inline int skl_hda_hdmi_build_controls(struct snd_soc_card *card)
|
|
{
|
|
struct skl_hda_private *ctx = snd_soc_card_get_drvdata(card);
|
|
struct snd_soc_component *component;
|
|
struct skl_hda_hdmi_pcm *pcm;
|
|
|
|
/* HDMI disabled, do not create controls */
|
|
if (list_empty(&ctx->hdmi_pcm_list))
|
|
return 0;
|
|
|
|
pcm = list_first_entry(&ctx->hdmi_pcm_list, struct skl_hda_hdmi_pcm,
|
|
head);
|
|
component = pcm->codec_dai->component;
|
|
if (!component)
|
|
return -EINVAL;
|
|
|
|
return hda_dsp_hdmi_build_controls(card, component);
|
|
}
|
|
|
|
#endif /* __SOUND_SOC_HDA_DSP_COMMON_H */
|