[alsa-devel] [PATCH] ASoC: SOF: Intel: hda: Fix SKL dai count
With fourth pin added for iDisp for skl_dai, update SOF_SKL_DAI_NUM to account for the change. Without this, dais from the bottom of the list are skipped. In current state that's the case for 'Alt Analog CPU DAI'.
Fixes: ac42b142cd76 ("ASoC: SOF: Intel: hda: Add iDisp4 DAI") Signed-off-by: Cezary Rojewski cezary.rojewski@intel.com --- sound/soc/sof/intel/hda.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 47408ec0de40..a4d030bfeee1 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -348,7 +348,7 @@
/* Number of DAIs */ #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) -#define SOF_SKL_NUM_DAIS 14 +#define SOF_SKL_NUM_DAIS 15 #else #define SOF_SKL_NUM_DAIS 8 #endif
On 1/13/20 5:40 AM, Cezary Rojewski wrote:
With fourth pin added for iDisp for skl_dai, update SOF_SKL_DAI_NUM to account for the change. Without this, dais from the bottom of the list are skipped. In current state that's the case for 'Alt Analog CPU DAI'.
Can you clarify if you are fixing an issue on TGL - which isn't supported in the mainline? Or fixing an issue with SKL w/ HDaudio support?
FWIW, I couldn't make HDaudio codec support work on KBL, with the changes in ASoC core, the HDaudio support is broken with the SKL driver (or depends on an unreleased topology). See traces at:
https://github.com/thesofproject/linux/pull/1667/commits/ae584cf633f232d9cf8...
Fixes: ac42b142cd76 ("ASoC: SOF: Intel: hda: Add iDisp4 DAI") Signed-off-by: Cezary Rojewski cezary.rojewski@intel.com
sound/soc/sof/intel/hda.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 47408ec0de40..a4d030bfeee1 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -348,7 +348,7 @@
/* Number of DAIs */ #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) -#define SOF_SKL_NUM_DAIS 14 +#define SOF_SKL_NUM_DAIS 15 #else #define SOF_SKL_NUM_DAIS 8 #endif
On 2020-01-13 16:30, Pierre-Louis Bossart wrote:
On 1/13/20 5:40 AM, Cezary Rojewski wrote:
With fourth pin added for iDisp for skl_dai, update SOF_SKL_DAI_NUM to account for the change. Without this, dais from the bottom of the list are skipped. In current state that's the case for 'Alt Analog CPU DAI'.
Can you clarify if you are fixing an issue on TGL - which isn't supported in the mainline? Or fixing an issue with SKL w/ HDaudio support?
This is not strictly connected to TGL but to any platform making use of 'skl_dai[]' within /sof/intel. Encountered this issue when playing with probes - my BEs added at the bottom of the list were omitted during component registration. Once debug flags in asoc were enabled, root-cause presented itself clearly.
FWIW, I couldn't make HDaudio codec support work on KBL, with the changes in ASoC core, the HDaudio support is broken with the SKL driver (or depends on an unreleased topology). See traces at:
https://github.com/thesofproject/linux/pull/1667/commits/ae584cf633f232d9cf8...
We do have working cAVS 1.5 machines (e.g.: SKL, KBL, KBL-R, ABL..) with HDA on our end. Will checkout the existing "vanilla skylake" to filter the least amount of changes needed to enable it. However, this can lead to topology binary needed to be updated.
Czarek
Fixes: ac42b142cd76 ("ASoC: SOF: Intel: hda: Add iDisp4 DAI") Signed-off-by: Cezary Rojewski cezary.rojewski@intel.com
On 1/14/20 5:18 AM, Cezary Rojewski wrote:
On 2020-01-13 16:30, Pierre-Louis Bossart wrote:
On 1/13/20 5:40 AM, Cezary Rojewski wrote:
With fourth pin added for iDisp for skl_dai, update SOF_SKL_DAI_NUM to account for the change. Without this, dais from the bottom of the list are skipped. In current state that's the case for 'Alt Analog CPU DAI'.
Can you clarify if you are fixing an issue on TGL - which isn't supported in the mainline? Or fixing an issue with SKL w/ HDaudio support?
This is not strictly connected to TGL but to any platform making use of 'skl_dai[]' within /sof/intel. Encountered this issue when playing with probes - my BEs added at the bottom of the list were omitted during component registration. Once debug flags in asoc were enabled, root-cause presented itself clearly.
ok.
Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
FWIW, I couldn't make HDaudio codec support work on KBL, with the changes in ASoC core, the HDaudio support is broken with the SKL driver (or depends on an unreleased topology). See traces at:
https://github.com/thesofproject/linux/pull/1667/commits/ae584cf633f232d9cf8...
We do have working cAVS 1.5 machines (e.g.: SKL, KBL, KBL-R, ABL..) with HDA on our end. Will checkout the existing "vanilla skylake" to filter the least amount of changes needed to enable it. However, this can lead to topology binary needed to be updated.
yes, that's the problem I faced, and since I don't have a clue how to change the topology on SKL I commented out the hard-coded parts in the machine driver.
The patch
ASoC: SOF: Intel: hda: Fix SKL dai count
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From a6947c9d86bcfd61b758b5693eba58defe7fd2ae Mon Sep 17 00:00:00 2001
From: Cezary Rojewski cezary.rojewski@intel.com Date: Mon, 13 Jan 2020 12:40:54 +0100 Subject: [PATCH] ASoC: SOF: Intel: hda: Fix SKL dai count
With fourth pin added for iDisp for skl_dai, update SOF_SKL_DAI_NUM to account for the change. Without this, dais from the bottom of the list are skipped. In current state that's the case for 'Alt Analog CPU DAI'.
Fixes: ac42b142cd76 ("ASoC: SOF: Intel: hda: Add iDisp4 DAI") Signed-off-by: Cezary Rojewski cezary.rojewski@intel.com Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Link: https://lore.kernel.org/r/20200113114054.9716-1-cezary.rojewski@intel.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/sof/intel/hda.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 18d7e72bf9b7..8981c00c4d94 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -345,7 +345,7 @@
/* Number of DAIs */ #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) -#define SOF_SKL_NUM_DAIS 14 +#define SOF_SKL_NUM_DAIS 15 #else #define SOF_SKL_NUM_DAIS 8 #endif
participants (3)
-
Cezary Rojewski -
Mark Brown -
Pierre-Louis Bossart