Unverified Commit 240ca955 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: Fixes 

Merge series from Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>:

Series of fixes for issues found during development and testing,
primarly for avs driver.
parents 3a2e3fa7 25148f57

include/sound/soc-acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ struct snd_soc_acpi_link_adr { 
/* Descriptor for SST ASoC machine driver */

struct snd_soc_acpi_mach {

	u8 id[ACPI_ID_LEN];

	const char *uid;

	const struct snd_soc_acpi_codecs *comp_ids;

	const u32 link_mask;

	const struct snd_soc_acpi_link_adr *links;

include/uapi/sound/skl-tplg-interface.h

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ enum skl_ch_cfg { 
	SKL_CH_CFG_DUAL_MONO = 9,

	SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10,

	SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11,

	SKL_CH_CFG_4_CHANNEL = 12,

	SKL_CH_CFG_7_1 = 12,

	SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1,

	SKL_CH_CFG_INVALID

};

sound/soc/intel/avs/apl.c

+5 −1
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ static bool apl_lp_streaming(struct avs_dev *adev) 
{

	struct avs_path *path;



	spin_lock(&adev->path_list_lock);

	/* Any gateway without buffer allocated in LP area disqualifies D0IX. */

	list_for_each_entry(path, &adev->path_list, node) {

		struct avs_path_pipeline *ppl;
@@ -188,11 +189,14 @@ static bool apl_lp_streaming(struct avs_dev *adev) 
				if (cfg->copier.dma_type == INVALID_OBJECT_ID)

					continue;



				if (!mod->gtw_attrs.lp_buffer_alloc)

				if (!mod->gtw_attrs.lp_buffer_alloc) {

					spin_unlock(&adev->path_list_lock);

					return false;

				}

			}

		}

	}

	spin_unlock(&adev->path_list_lock);



	return true;

}

sound/soc/intel/avs/avs.h

+2 −2
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ void avs_release_firmwares(struct avs_dev *adev); 


int avs_dsp_init_module(struct avs_dev *adev, u16 module_id, u8 ppl_instance_id,

			u8 core_id, u8 domain, void *param, u32 param_size,

			u16 *instance_id);

void avs_dsp_delete_module(struct avs_dev *adev, u16 module_id, u16 instance_id,

			u8 *instance_id);

void avs_dsp_delete_module(struct avs_dev *adev, u16 module_id, u8 instance_id,

			   u8 ppl_instance_id, u8 core_id);

int avs_dsp_create_pipeline(struct avs_dev *adev, u16 req_size, u8 priority,

			    bool lp, u16 attributes, u8 *instance_id);

sound/soc/intel/avs/board_selection.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static int avs_register_i2s_boards(struct avs_dev *adev) 
	}



	for (mach = boards->machs; mach->id[0]; mach++) {

		if (!acpi_dev_present(mach->id, NULL, -1))

		if (!acpi_dev_present(mach->id, mach->uid, -1))

			continue;



		if (mach->machine_quirk)