audio: when audio hdmirx is unstable, mute all input buffer [1/2]

PD#SWPL-12104

Problem:
when hdmirx timing switching, pop noise.

Solution:
when audio hdmirx is unstable, mute all input buffer

Verify:
T962x2 x301

Change-Id: I594b5bf9c1f4af45bb3653a7bfef5e0c7dab2825
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

diff --git a/include/linux/amlogic/media/sound/misc.h b/include/linux/amlogic/media/sound/misc.h
index c9e9fbda9613e44135ad8027c891602118ea0187..866644e70b09437fc24085e5da48ef811182b29d 100644 (file)
--- a/include/linux/amlogic/media/sound/misc.h
+++ b/include/linux/amlogic/media/sound/misc.h
@@ -75,6 +75,9 @@ extern int aml_get_hdmiin_audio_packet(
        struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol);
 
+extern int get_hdmiin_audio_stable(void);
+extern int get_hdmi_sample_rate_index(void);
+
 #endif
 
 #endif

diff --git a/sound/soc/amlogic/auge/extn.c b/sound/soc/amlogic/auge/extn.c
index 31a208aa7482925b4f38ebdc3ce83ef97d38ab13..c8db16fda59ec0d899a8aa1ff14437c8365fd5ce 100644 (file)
--- a/sound/soc/amlogic/auge/extn.c
+++ b/sound/soc/amlogic/auge/extn.c
@@ -343,6 +343,38 @@ static int extn_mmap(struct snd_pcm_substream *substream,
        return snd_pcm_lib_default_mmap(substream, vma);
 }
 
+static int extn_copy(struct snd_pcm_substream *substream, int channel,
+                       snd_pcm_uframes_t pos,
+                       void __user *buf, snd_pcm_uframes_t count)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       char *hwbuf = runtime->dma_area + frames_to_bytes(runtime, pos);
+       int bytes = frames_to_bytes(runtime, count);
+
+       if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+               if (copy_from_user(hwbuf, buf, bytes))
+                       return -EFAULT;
+       }  else {
+#ifdef CONFIG_AMLOGIC_MEDIA_TVIN_HDMI
+               enum toddr_src src = toddr_src_get();
+
+               /*if hdmirx or N&CTS is unstable, clear all buffer data.*/
+               if (src == FRHDMIRX && (!get_hdmiin_audio_stable() ||
+                               get_hdmi_sample_rate_index() == 0)) {
+                       char *buffer = runtime->dma_area;
+                       int buffer_size = snd_pcm_lib_buffer_bytes(substream);
+
+                       memset(buffer, 0, buffer_size);
+               }
+#endif
+               if (copy_to_user(buf, hwbuf, bytes))
+                       return -EFAULT;
+
+               memset(hwbuf, 0, bytes);
+       }
+       return 0;
+}
+
 static struct snd_pcm_ops extn_ops = {
        .open      = extn_open,
        .close     = extn_close,
@@ -354,6 +386,7 @@ static struct snd_pcm_ops extn_ops = {
        .pointer   = extn_pointer,
        .silence   = extn_silence,
        .mmap      = extn_mmap,
+       .copy      = extn_copy,
 };
 
 static int extn_new(struct snd_soc_pcm_runtime *rtd)

diff --git a/sound/soc/amlogic/common/misc.c b/sound/soc/amlogic/common/misc.c
index 1b4670564d6e10ca92f8e90fd681da5e21878f80..10c10a9e9b87fd24aacaa2f79bd1f75fef605105 100644 (file)
--- a/sound/soc/amlogic/common/misc.c
+++ b/sound/soc/amlogic/common/misc.c
@@ -199,15 +199,21 @@ const struct soc_enum hdmi_in_status_enum[] = {
                        hdmi_in_audio_packet)
 };
 
-int aml_get_hdmiin_audio_stable(
-       struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
+int get_hdmiin_audio_stable(void)
 {
        struct rx_audio_stat_s aud_sts;
 
        rx_get_audio_status(&aud_sts);
+
+       return (aud_sts.aud_rcv_packet == 0) ? 0 : 1;
+}
+
+int aml_get_hdmiin_audio_stable(
+       struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol)
+{
        ucontrol->value.integer.value[0] =
-               (aud_sts.aud_rcv_packet == 0) ? 0 : 1;
+               get_hdmiin_audio_stable();
 
        return 0;
 }