[alsa-devel] [PATCH 1/2] ALSA: hda - Remove unused variable
Signed-off-by: Wang Xingchao xingchao.wang@linux.intel.com --- sound/pci/hda/patch_hdmi.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 7803ddd..0f7a380 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1891,7 +1891,6 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec,
/* override pins connection list */ snd_printdd("hdmi: haswell: override pin connection 0x%x\n", nid); - nconns = max(spec->num_cvts, 4); snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); }
Pin's connection list may change dynamically with hot-plug event on Intel Haswell chip. Users would see connections be "0" in codec#. when play audio on this pin, software choose connections from cache. So add Cache connection info to avoid confuse.
Signed-off-by: Wang Xingchao xingchao.wang@linux.intel.com --- sound/pci/hda/hda_codec.c | 13 +++++++++++++ sound/pci/hda/hda_codec.h | 2 ++ sound/pci/hda/hda_proc.c | 13 ++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 55108b5..7517fd6 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -354,6 +354,19 @@ lookup_conn_list(struct hda_codec *codec, hda_nid_t nid) return NULL; }
+int lookup_cache_conn(struct hda_codec *codec, + hda_nid_t pin_nid, hda_nid_t *conn_list) +{ + struct hda_conn_list *p; + + p = lookup_conn_list(codec, pin_nid); + if (p) { + memcpy(conn_list, p->conns, p->len * sizeof(hda_nid_t)); + return p->len; + } + return 0; +} + static int add_conn_list(struct hda_codec *codec, hda_nid_t nid, int len, const hda_nid_t *list) { diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index c93f902..145d184 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -963,6 +963,8 @@ snd_hda_get_num_conns(struct hda_codec *codec, hda_nid_t nid) int snd_hda_get_num_raw_conns(struct hda_codec *codec, hda_nid_t nid); int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *conn_list, int max_conns); +int lookup_cache_conn(struct hda_codec *codec, + hda_nid_t pin_nid, hda_nid_t *conn_list); int snd_hda_get_conn_list(struct hda_codec *codec, hda_nid_t nid, const hda_nid_t **listp); int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums, diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 0fee8fa..e52ad3c 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -504,6 +504,7 @@ static void print_conn_list(struct snd_info_buffer *buffer, int conn_len) { int c, curr = -1; + hda_nid_t cache_conn[4];
if (conn_len > 1 && wid_type != AC_WID_AUD_MIX && @@ -511,7 +512,7 @@ static void print_conn_list(struct snd_info_buffer *buffer, wid_type != AC_WID_POWER) curr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0); - snd_iprintf(buffer, " Connection: %d\n", conn_len); + snd_iprintf(buffer, " Raw Connection: %d\n", conn_len); if (conn_len > 0) { snd_iprintf(buffer, " "); for (c = 0; c < conn_len; c++) { @@ -521,6 +522,16 @@ static void print_conn_list(struct snd_info_buffer *buffer, } snd_iprintf(buffer, "\n"); } + + /* Get Cache connections info */ + conn_len = lookup_cache_conn(codec, nid, cache_conn); + if (conn_len > 0) { + snd_iprintf(buffer, " Cache Connection: %d\n", conn_len); + snd_iprintf(buffer, " "); + for (c = 0; c < conn_len; c++) + snd_iprintf(buffer, " 0x%02x", cache_conn[c]); + snd_iprintf(buffer, "\n"); + } }
static void print_gpio(struct snd_info_buffer *buffer,
Hi Takashi,
Quote from Mengdong: " Could you double check whether size of " cache_conn" is big enough? Some non-Haswell audio codec may have very large connection list. + conn_len = lookup_cache_conn(codec, nid, cache_conn);"
So this is a bug for codec with more than 4 connections. At my first thought, I would like to get hda_conn_list pointer, but hda_conn_list is the structure defined in hda_codec.c and lookup_conn_list() is static.
If we really need this, I think it's better to change the function type and move the structure definition to hda_codec.h.
thanks --xingchao
-----Original Message----- From: Wang Xingchao [mailto:xingchao.wang@linux.intel.com] Sent: Friday, June 21, 2013 12:42 PM To: tiwai@suse.de Cc: alsa-devel@alsa-project.org; Lin, Mengdong; Wang, Xingchao; Wang Xingchao Subject: [PATCH 2/2] ALSA: hda - Add cache connection info
Pin's connection list may change dynamically with hot-plug event on Intel Haswell chip. Users would see connections be "0" in codec#. when play audio on this pin, software choose connections from cache. So add Cache connection info to avoid confuse.
Signed-off-by: Wang Xingchao xingchao.wang@linux.intel.com
sound/pci/hda/hda_codec.c | 13 +++++++++++++ sound/pci/hda/hda_codec.h | 2 ++ sound/pci/hda/hda_proc.c | 13 ++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 55108b5..7517fd6 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -354,6 +354,19 @@ lookup_conn_list(struct hda_codec *codec, hda_nid_t nid) return NULL; }
+int lookup_cache_conn(struct hda_codec *codec,
hda_nid_t pin_nid, hda_nid_t *conn_list) {- struct hda_conn_list *p;
- p = lookup_conn_list(codec, pin_nid);
- if (p) {
memcpy(conn_list, p->conns, p->len * sizeof(hda_nid_t));return p->len;- }
- return 0;
+}
static int add_conn_list(struct hda_codec *codec, hda_nid_t nid, int len, const hda_nid_t *list) { diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index c93f902..145d184 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -963,6 +963,8 @@ snd_hda_get_num_conns(struct hda_codec *codec, hda_nid_t nid) int snd_hda_get_num_raw_conns(struct hda_codec *codec, hda_nid_t nid); int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *conn_list, int max_conns); +int lookup_cache_conn(struct hda_codec *codec,
hda_nid_t pin_nid, hda_nid_t *conn_list);int snd_hda_get_conn_list(struct hda_codec *codec, hda_nid_t nid, const hda_nid_t **listp); int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums, diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 0fee8fa..e52ad3c 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -504,6 +504,7 @@ static void print_conn_list(struct snd_info_buffer *buffer, int conn_len) { int c, curr = -1;
hda_nid_t cache_conn[4];
if (conn_len > 1 && wid_type != AC_WID_AUD_MIX &&
@@ -511,7 +512,7 @@ static void print_conn_list(struct snd_info_buffer *buffer, wid_type != AC_WID_POWER) curr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);
- snd_iprintf(buffer, " Connection: %d\n", conn_len);
- snd_iprintf(buffer, " Raw Connection: %d\n", conn_len); if (conn_len > 0) { snd_iprintf(buffer, " "); for (c = 0; c < conn_len; c++) {
@@ -521,6 +522,16 @@ static void print_conn_list(struct snd_info_buffer *buffer, } snd_iprintf(buffer, "\n"); }
- /* Get Cache connections info */
- conn_len = lookup_cache_conn(codec, nid, cache_conn);
- if (conn_len > 0) {
snd_iprintf(buffer, " Cache Connection: %d\n", conn_len);snd_iprintf(buffer, " ");for (c = 0; c < conn_len; c++)snd_iprintf(buffer, " 0x%02x", cache_conn[c]);snd_iprintf(buffer, "\n");- }
}
static void print_gpio(struct snd_info_buffer *buffer,
1.8.1.2
At Fri, 21 Jun 2013 06:26:27 +0000, Wang, Xingchao wrote:
Hi Takashi,
Quote from Mengdong: " Could you double check whether size of " cache_conn" is big enough? Some non-Haswell audio codec may have very large connection list.
- conn_len = lookup_cache_conn(codec, nid, cache_conn);"
So this is a bug for codec with more than 4 connections. At my first thought, I would like to get hda_conn_list pointer, but hda_conn_list is the structure defined in hda_codec.c and lookup_conn_list() is static.
If we really need this, I think it's better to change the function type and move the structure definition to hda_codec.h.
Just call snd_hda_get_conn_list() and compare where the result is same as the raw output, and print the list values only if different.
Takashi
thanks --xingchao
-----Original Message----- From: Wang Xingchao [mailto:xingchao.wang@linux.intel.com] Sent: Friday, June 21, 2013 12:42 PM To: tiwai@suse.de Cc: alsa-devel@alsa-project.org; Lin, Mengdong; Wang, Xingchao; Wang Xingchao Subject: [PATCH 2/2] ALSA: hda - Add cache connection info
Pin's connection list may change dynamically with hot-plug event on Intel Haswell chip. Users would see connections be "0" in codec#. when play audio on this pin, software choose connections from cache. So add Cache connection info to avoid confuse.
Signed-off-by: Wang Xingchao xingchao.wang@linux.intel.com
sound/pci/hda/hda_codec.c | 13 +++++++++++++ sound/pci/hda/hda_codec.h | 2 ++ sound/pci/hda/hda_proc.c | 13 ++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 55108b5..7517fd6 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -354,6 +354,19 @@ lookup_conn_list(struct hda_codec *codec, hda_nid_t nid) return NULL; }
+int lookup_cache_conn(struct hda_codec *codec,
hda_nid_t pin_nid, hda_nid_t *conn_list) {- struct hda_conn_list *p;
- p = lookup_conn_list(codec, pin_nid);
- if (p) {
memcpy(conn_list, p->conns, p->len * sizeof(hda_nid_t));return p->len;- }
- return 0;
+}
static int add_conn_list(struct hda_codec *codec, hda_nid_t nid, int len, const hda_nid_t *list) { diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index c93f902..145d184 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -963,6 +963,8 @@ snd_hda_get_num_conns(struct hda_codec *codec, hda_nid_t nid) int snd_hda_get_num_raw_conns(struct hda_codec *codec, hda_nid_t nid); int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *conn_list, int max_conns); +int lookup_cache_conn(struct hda_codec *codec,
hda_nid_t pin_nid, hda_nid_t *conn_list);int snd_hda_get_conn_list(struct hda_codec *codec, hda_nid_t nid, const hda_nid_t **listp); int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums, diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 0fee8fa..e52ad3c 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -504,6 +504,7 @@ static void print_conn_list(struct snd_info_buffer *buffer, int conn_len) { int c, curr = -1;
hda_nid_t cache_conn[4];
if (conn_len > 1 && wid_type != AC_WID_AUD_MIX &&
@@ -511,7 +512,7 @@ static void print_conn_list(struct snd_info_buffer *buffer, wid_type != AC_WID_POWER) curr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);
- snd_iprintf(buffer, " Connection: %d\n", conn_len);
- snd_iprintf(buffer, " Raw Connection: %d\n", conn_len); if (conn_len > 0) { snd_iprintf(buffer, " "); for (c = 0; c < conn_len; c++) {
@@ -521,6 +522,16 @@ static void print_conn_list(struct snd_info_buffer *buffer, } snd_iprintf(buffer, "\n"); }
- /* Get Cache connections info */
- conn_len = lookup_cache_conn(codec, nid, cache_conn);
- if (conn_len > 0) {
snd_iprintf(buffer, " Cache Connection: %d\n", conn_len);snd_iprintf(buffer, " ");for (c = 0; c < conn_len; c++)snd_iprintf(buffer, " 0x%02x", cache_conn[c]);snd_iprintf(buffer, "\n");- }
}
static void print_gpio(struct snd_info_buffer *buffer,
1.8.1.2
Hi Takashi,
-----Original Message----- From: Takashi Iwai [mailto:tiwai@suse.de] Sent: Friday, June 21, 2013 5:33 PM To: Wang, Xingchao Cc: alsa-devel@alsa-project.org; Lin, Mengdong; Wang Xingchao Subject: Re: [PATCH 2/2] ALSA: hda - Add cache connection info
At Fri, 21 Jun 2013 06:26:27 +0000, Wang, Xingchao wrote:
Hi Takashi,
Quote from Mengdong: " Could you double check whether size of " cache_conn" is big enough? Some
non-Haswell audio codec may have very large connection list.
- conn_len = lookup_cache_conn(codec, nid, cache_conn);"
So this is a bug for codec with more than 4 connections. At my first thought, I would like to get hda_conn_list pointer, but
hda_conn_list is the structure defined in hda_codec.c and lookup_conn_list() is static.
If we really need this, I think it's better to change the function type and move
the structure definition to hda_codec.h.
Just call snd_hda_get_conn_list() and compare where the result is same as the raw output, and print the list values only if different.
Please review the reworked patch, I sent out already. I will test the patch tormorrow as my machine cannot reboot atm. So just have a look whether it match your idea. :)
Thanks --xingchao
Takashi
thanks --xingchao
-----Original Message----- From: Wang Xingchao [mailto:xingchao.wang@linux.intel.com] Sent: Friday, June 21, 2013 12:42 PM To: tiwai@suse.de Cc: alsa-devel@alsa-project.org; Lin, Mengdong; Wang, Xingchao; Wang Xingchao Subject: [PATCH 2/2] ALSA: hda - Add cache connection info
Pin's connection list may change dynamically with hot-plug event on Intel Haswell chip. Users would see connections be "0" in codec#. when play audio on this pin, software choose connections from cache. So add Cache connection info to avoid confuse.
Signed-off-by: Wang Xingchao xingchao.wang@linux.intel.com
sound/pci/hda/hda_codec.c | 13 +++++++++++++ sound/pci/hda/hda_codec.h | 2 ++ sound/pci/hda/hda_proc.c | 13 ++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 55108b5..7517fd6 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -354,6 +354,19 @@ lookup_conn_list(struct hda_codec *codec, hda_nid_t nid) return NULL; }
+int lookup_cache_conn(struct hda_codec *codec,
hda_nid_t pin_nid, hda_nid_t *conn_list) {- struct hda_conn_list *p;
- p = lookup_conn_list(codec, pin_nid);
- if (p) {
memcpy(conn_list, p->conns, p->len * sizeof(hda_nid_t));return p->len;- }
- return 0;
+}
static int add_conn_list(struct hda_codec *codec, hda_nid_t nid, int len, const hda_nid_t *list) { diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index c93f902..145d184 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -963,6 +963,8 @@ snd_hda_get_num_conns(struct hda_codec
*codec,
hda_nid_t nid) int snd_hda_get_num_raw_conns(struct hda_codec *codec, hda_nid_t nid); int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *conn_list, int max_conns); +int lookup_cache_conn(struct hda_codec *codec,
hda_nid_t pin_nid, hda_nid_t *conn_list);int snd_hda_get_conn_list(struct hda_codec *codec, hda_nid_t nid, const hda_nid_t **listp); int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums, diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 0fee8fa..e52ad3c 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -504,6 +504,7 @@ static void print_conn_list(struct snd_info_buffer *buffer, int conn_len) { int c, curr = -1;
hda_nid_t cache_conn[4];
if (conn_len > 1 && wid_type != AC_WID_AUD_MIX &&
@@ -511,7 +512,7 @@ static void print_conn_list(struct snd_info_buffer *buffer, wid_type != AC_WID_POWER) curr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);
- snd_iprintf(buffer, " Connection: %d\n", conn_len);
- snd_iprintf(buffer, " Raw Connection: %d\n", conn_len); if (conn_len > 0) { snd_iprintf(buffer, " "); for (c = 0; c < conn_len; c++) {
@@ -521,6 +522,16 @@ static void print_conn_list(struct snd_info_buffer *buffer, } snd_iprintf(buffer, "\n"); }
- /* Get Cache connections info */
- conn_len = lookup_cache_conn(codec, nid, cache_conn);
- if (conn_len > 0) {
snd_iprintf(buffer, " Cache Connection: %d\n", conn_len);snd_iprintf(buffer, " ");for (c = 0; c < conn_len; c++)snd_iprintf(buffer, " 0x%02x", cache_conn[c]);snd_iprintf(buffer, "\n");- }
}
static void print_gpio(struct snd_info_buffer *buffer,
1.8.1.2
participants (3)
-
Takashi Iwai -
Wang Xingchao -
Wang, Xingchao