ALSA: hda: Retry codec read on first time failure
diff mbox series

Message ID 20190813110307.5898-1-vani.ganji@intel.com
State New
Headers show
Series
  • ALSA: hda: Retry codec read on first time failure
Related show

Commit Message

vani.ganji@intel.com Aug. 13, 2019, 11:03 a.m. UTC
From: Vani Ganji <vani.ganji@intel.com>

Sometimes HDMI audio fails while fast switching
between HDMI and Speaker due to codec Get Power state verb read failure.

Verb is codec driver to access codec HW. Since issue scenario involves
fast switching between HDMI and speaker, there might be chance to fail
read from HW and same happened in the error scenario.

Based on Display/Graphics architect suggestion, added a retry mechanism
for failure on first attempt.

Signed-off-by: Vani Ganji <vani.ganji@intel.com>
---
 sound/hda/hdac_device.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Comments

Takashi Iwai Aug. 14, 2019, 6:27 a.m. UTC | #1
On Tue, 13 Aug 2019 13:03:07 +0200,
vani.ganji@intel.com wrote:
> 
> From: Vani Ganji <vani.ganji@intel.com>
> 
> Sometimes HDMI audio fails while fast switching
> between HDMI and Speaker due to codec Get Power state verb read failure.
> 
> Verb is codec driver to access codec HW. Since issue scenario involves
> fast switching between HDMI and speaker, there might be chance to fail
> read from HW and same happened in the error scenario.
> 
> Based on Display/Graphics architect suggestion, added a retry mechanism
> for failure on first attempt.
> 
> Signed-off-by: Vani Ganji <vani.ganji@intel.com>

Does this still happen with the latest 5.3-rc kernel?
The recent fix to add the write-sync for Intel platforms should
already cover this kind of errors.


thanks,

Takashi

Patch
diff mbox series

diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c
index b26cc93e7e10..225bd1bfe156 100644
--- a/sound/hda/hdac_device.c
+++ b/sound/hda/hdac_device.c
@@ -984,10 +984,17 @@  static unsigned int codec_read(struct hdac_device *hdac, hda_nid_t nid,
 {
 	unsigned int cmd = snd_hdac_make_cmd(hdac, nid, verb, parm);
 	unsigned int res;
-
-	if (snd_hdac_exec_verb(hdac, cmd, flags, &res))
-		return -1;
-
+	unsigned int count;
+
+	/* Retry verb once more if it fails first time */
+	/* recommended to retry since it is HW related */
+	for (count = 0; count <= 1; count++) {
+		if (snd_hdac_exec_verb(hdac, cmd, flags, &res))
+			if (count == 1)
+				return -1;
+		} else
+			break;
+	}
 	return res;
 }