diff mbox series

topology: hda-dsp: Remove srcintc module from HDA DSP topology

Message ID 20200821102105.3210-1-mateusz.gorski@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series topology: hda-dsp: Remove srcintc module from HDA DSP topology | expand

Commit Message

Gorski, Mateusz Aug. 21, 2020, 10:21 a.m. UTC 
The main goal of this topology is to handle every device with hda-dsp
configuration on Skylake SST driver.

The module_id value for srcintc module varies by FW branch, which makes
it impossible to have one universal topology with srcintc module for all of them.

Remove srcintc from this topology to make it truly universal.

Signed-off-by: Mateusz Gorski <mateusz.gorski@linux.intel.com>
---
 .../hda-dsp/skl_hda_dsp_generic-tplg.conf     | 218 +-----------------
 1 file changed, 7 insertions(+), 211 deletions(-)

Comments

Takashi Iwai Aug. 23, 2020, 10:49 a.m. UTC | #1 
On Fri, 21 Aug 2020 12:21:05 +0200,
Mateusz Gorski wrote:
> 
> The main goal of this topology is to handle every device with hda-dsp
> configuration on Skylake SST driver.
> 
> The module_id value for srcintc module varies by FW branch, which makes
> it impossible to have one universal topology with srcintc module for all of them.
> 
> Remove srcintc from this topology to make it truly universal.
> 
> Signed-off-by: Mateusz Gorski <mateusz.gorski@linux.intel.com>

Applied now.  Thanks.


Takashi
diff mbox series

Patch

diff --git a/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf b/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf
index 32ba9a7..17b7af0 100644
--- a/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf
+++ b/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf
@@ -102,7 +102,7 @@  SectionVendorTuples."mod_type_data_size_desc" {
     }
 
     tuples."short.u16_size_desc" {
-        SKL_TKN_U16_BLOCK_SIZE "6436"
+        SKL_TKN_U16_BLOCK_SIZE "6072"
     }
 }
 
@@ -114,7 +114,7 @@  SectionVendorTuples."mod_type_data" {
     tokens "skl_tokens"
 
     tuples."byte.u8_num_mod" {
-        SKL_TKN_U8_NUM_MOD "5"
+        SKL_TKN_U8_NUM_MOD "4"
     }
 
     tuples."uuid.mod_0" {
@@ -1252,74 +1252,6 @@  SectionVendorTuples."mod_type_data" {
         SKL_TKN_U32_FMT_SAMPLE_TYPE "0"
         SKL_TKN_U32_FMT_CH_MAP "4294967056"
     }
-
-    tuples."uuid.mod_4" {
-        SKL_TKN_UUID "141, 178, 27, 230, 154, 20, 31, 76, 183, 9, 70, 130, 62, 245, 245, 174"
-    }
-
-    tuples."byte.u8_mod_type_4" {
-        SKL_TKN_MM_U8_MOD_IDX "4"
-        SKL_TKN_U8_IN_PIN_TYPE "0"
-        SKL_TKN_U8_OUT_PIN_TYPE "0"
-        SKL_TKN_U8_IN_QUEUE_COUNT "1"
-        SKL_TKN_U8_OUT_QUEUE_COUNT "1"
-        SKL_TKN_MM_U8_NUM_RES "1"
-        SKL_TKN_MM_U8_NUM_INTF "1"
-    }
-
-    tuples."word.u32_mod_type_4_res_0" {
-        SKL_TKN_MM_U32_RES_ID "0"
-        SKL_TKN_U32_MEM_PAGES "4"
-        SKL_TKN_MM_U32_CPS "100000"
-        SKL_TKN_U32_IBS "384"
-        SKL_TKN_U32_OBS "384"
-        SKL_TKN_MM_U32_DMA_SIZE "0"
-        SKL_TKN_MM_U32_CPC "10157"
-    }
-
-    tuples."word.u32_mod_type_4_res_0_input_0" {
-        SKL_TKN_U32_DIR_PIN_COUNT "0"
-        SKL_TKN_MM_U32_RES_PIN_ID "0"
-        SKL_TKN_MM_U32_PIN_BUF "384"
-    }
-
-    tuples."word.u32_mod_type_4_res_0_output_0" {
-        SKL_TKN_U32_DIR_PIN_COUNT "1"
-        SKL_TKN_MM_U32_RES_PIN_ID "0"
-        SKL_TKN_MM_U32_PIN_BUF "384"
-    }
-
-    tuples."word.u32_mod_type_4_intf_0" {
-        SKL_TKN_MM_U32_FMT_ID "0"
-        SKL_TKN_MM_U32_NUM_IN_FMT "1"
-        SKL_TKN_MM_U32_NUM_OUT_FMT "1"
-    }
-
-    tuples."word.u32_mod_type_4_intf_0_input_0" {
-        SKL_TKN_U32_DIR_PIN_COUNT "0"
-        SKL_TKN_MM_U32_INTF_PIN_ID "0"
-        SKL_TKN_U32_FMT_CH "2"
-        SKL_TKN_U32_FMT_FREQ "48000"
-        SKL_TKN_U32_FMT_BIT_DEPTH "32"
-        SKL_TKN_U32_FMT_CH_CONFIG "1"
-        SKL_TKN_U32_FMT_INTERLEAVE "0"
-        SKL_TKN_U32_FMT_SAMPLE_SIZE "32"
-        SKL_TKN_U32_FMT_SAMPLE_TYPE "0"
-        SKL_TKN_U32_FMT_CH_MAP "4294967056"
-    }
-
-    tuples."word.u32_mod_type_4_intf_0_output_0" {
-        SKL_TKN_U32_DIR_PIN_COUNT "1"
-        SKL_TKN_MM_U32_INTF_PIN_ID "0"
-        SKL_TKN_U32_FMT_CH "2"
-        SKL_TKN_U32_FMT_FREQ "48000"
-        SKL_TKN_U32_FMT_BIT_DEPTH "32"
-        SKL_TKN_U32_FMT_CH_CONFIG "1"
-        SKL_TKN_U32_FMT_INTERLEAVE "0"
-        SKL_TKN_U32_FMT_SAMPLE_SIZE "32"
-        SKL_TKN_U32_FMT_SAMPLE_TYPE "0"
-        SKL_TKN_U32_FMT_CH_MAP "4294967056"
-    }
 }
 
 SectionData."mod_type_data" {
@@ -1597,12 +1529,12 @@  SectionVendorTuples."media0_in updwmix 0" {
 
     tuples."word.out_pin_0" {
         SKL_TKN_U32_DIR_PIN_COUNT "1"
-        SKL_TKN_U32_PIN_MOD_ID "8"
+        SKL_TKN_U32_PIN_MOD_ID "0"
         SKL_TKN_U32_PIN_INST_ID "0"
     }
 
     tuples."uuid.out_pin_0" {
-        SKL_TKN_UUID "141, 178, 27, 230, 154, 20, 31, 76, 183, 9, 70, 130, 62, 245, 245, 174"
+        SKL_TKN_UUID "178, 110, 101, 57, 113, 59, 73, 64, 141, 63, 249, 44, 213, 196, 60, 9"
     }
 }
 
@@ -1623,141 +1555,6 @@  SectionWidget."media0_in updwmix 0" {
     ]
 }
 
-SectionVendorTuples."media0_in srcintc 0 num_desc" {
-    tokens "skl_tokens"
-
-    tuples."byte.u8_num_blocks" {
-        SKL_TKN_U8_NUM_BLOCKS "1"
-    }
-}
-
-SectionData."media0_in srcintc 0 num_desc" {
-    tuples "media0_in srcintc 0 num_desc"
-}
-
-SectionVendorTuples."media0_in srcintc 0_size_desc" {
-    tokens "skl_tokens"
-
-    tuples."byte.u8_block_type" {
-        SKL_TKN_U8_BLOCK_TYPE "0"
-    }
-
-    tuples."short.u16_size_desc" {
-        SKL_TKN_U16_BLOCK_SIZE "388"
-    }
-}
-
-SectionData."media0_in srcintc 0_size_desc" {
-    tuples "media0_in srcintc 0_size_desc"
-}
-
-SectionVendorTuples."media0_in srcintc 0" {
-    tokens "skl_tokens"
-
-    tuples."uuid" {
-        SKL_TKN_UUID "141, 178, 27, 230, 154, 20, 31, 76, 183, 9, 70, 130, 62, 245, 245, 174"
-    }
-
-    tuples."byte.u8_data" {
-        SKL_TKN_U8_IN_PIN_TYPE "0"
-        SKL_TKN_U8_OUT_PIN_TYPE "0"
-        SKL_TKN_U8_DYN_IN_PIN "0"
-        SKL_TKN_U8_DYN_OUT_PIN "0"
-        SKL_TKN_U8_TIME_SLOT "0"
-        SKL_TKN_U8_CORE_ID "0"
-        SKL_TKN_U8_MODULE_TYPE "3"
-        SKL_TKN_U8_CONN_TYPE "0"
-        SKL_TKN_U8_HW_CONN_TYPE "1"
-        SKL_TKN_U8_DEV_TYPE "6"
-    }
-
-    tuples."short.u16_data" {
-        SKL_TKN_U16_MOD_INST_ID "0"
-    }
-
-    tuples."word.u32_data" {
-        SKL_TKN_U32_VBUS_ID "4294967295"
-        SKL_TKN_U32_PARAMS_FIXUP "0"
-        SKL_TKN_U32_CONVERTER "0"
-        SKL_TKN_U32_PIPE_ID "0"
-        SKL_TKN_U32_PIPE_CONN_TYPE "1"
-        SKL_TKN_U32_PIPE_PRIORITY "0"
-        SKL_TKN_U32_PMODE "0"
-        SKL_TKN_U32_D0I3_CAPS "1"
-        SKL_TKN_U32_PROC_DOMAIN "1"
-        SKL_TKN_U32_PIPE_DIRECTION "0"
-        SKL_TKN_U32_NUM_CONFIGS "1"
-        SKL_TKN_U32_DMA_BUF_SIZE "2"
-    }
-
-    tuples."word._pipe_0" {
-        SKL_TKN_U32_PIPE_CONFIG_ID "0"
-        SKL_TKN_U32_PATH_MEM_PGS "8"
-    }
-
-    tuples."word._pipe_u32_cfg_in_fmt_0" {
-        SKL_TKN_U32_DIR_PIN_COUNT "0"
-        SKL_TKN_U32_CFG_FREQ "48000"
-    }
-
-    tuples."word._pipe_u8_cfg_in_fmt_0" {
-        SKL_TKN_U8_CFG_BPS "16"
-        SKL_TKN_U8_CFG_CHAN "2"
-    }
-
-    tuples."word._pipe_u32_cfg_out_fmt_0" {
-        SKL_TKN_U32_DIR_PIN_COUNT "1"
-        SKL_TKN_U32_CFG_FREQ "48000"
-    }
-
-    tuples."word._pipe_u8_cfg_out_fmt_0" {
-        SKL_TKN_U8_CFG_BPS "32"
-        SKL_TKN_U8_CFG_CHAN "2"
-    }
-
-    tuples."short.u16_pipe_mod_cfg_0" {
-        SKL_TKN_CFG_MOD_RES_ID "0"
-        SKL_TKN_CFG_MOD_FMT_ID "0"
-    }
-
-    tuples."word.in_pin_0" {
-        SKL_TKN_U32_DIR_PIN_COUNT "0"
-        SKL_TKN_U32_PIN_MOD_ID "7"
-        SKL_TKN_U32_PIN_INST_ID "0"
-    }
-
-    tuples."uuid.in_pin_0" {
-        SKL_TKN_UUID "12, 6, 248, 66, 47, 131, 191, 77, 178, 71, 81, 233, 97, 153, 123, 52"
-    }
-
-    tuples."word.out_pin_0" {
-        SKL_TKN_U32_DIR_PIN_COUNT "1"
-        SKL_TKN_U32_PIN_MOD_ID "0"
-        SKL_TKN_U32_PIN_INST_ID "0"
-    }
-
-    tuples."uuid.out_pin_0" {
-        SKL_TKN_UUID "178, 110, 101, 57, 113, 59, 73, 64, 141, 63, 249, 44, 213, 196, 60, 9"
-    }
-}
-
-SectionData."media0_in srcintc 0" {
-    tuples "media0_in srcintc 0"
-}
-
-SectionWidget."media0_in srcintc 0" {
-    index "0"
-    type "pga"
-    no_pm "true"
-    event_type "4"
-
-    data [
-        "media0_in srcintc 0 num_desc"
-        "media0_in srcintc 0_size_desc"
-        "media0_in srcintc 0"
-    ]
-}
-
 SectionVendorTuples."media0_in mi num_desc" {
     tokens "skl_tokens"
 
@@ -1857,12 +1654,12 @@  SectionVendorTuples."media0_in mi" {
 
     tuples."word.in_pin_0" {
         SKL_TKN_U32_DIR_PIN_COUNT "0"
-        SKL_TKN_U32_PIN_MOD_ID "8"
+        SKL_TKN_U32_PIN_MOD_ID "7"
         SKL_TKN_U32_PIN_INST_ID "0"
     }
 
     tuples."uuid.in_pin_0" {
-        SKL_TKN_UUID "141, 178, 27, 230, 154, 20, 31, 76, 183, 9, 70, 130, 62, 245, 245, 174"
+        SKL_TKN_UUID "12, 6, 248, 66, 47, 131, 191, 77, 178, 71, 81, 233, 97, 153, 123, 52"
     }
 
     tuples."word.out_pin_0" {
@@ -8013,8 +7810,7 @@  SectionGraph."Pipeline 1 Graph" {
     lines [
         "media0_in cpr 0, , hda-dsp-analog-playback"
         "media0_in updwmix 0, , media0_in cpr 0"
-        "media0_in srcintc 0, , media0_in updwmix 0"
-        "media0_in mi, , media0_in srcintc 0"
+        "media0_in mi, , media0_in updwmix 0"
         "codec0_out cpr 1, , codec0_out mo"
         "codec0_out, , codec0_out cpr 1"
         "media1_in cpr 2, , hda-dsp-digital-playback"