ALSA: hda/hdmi: fix stream-id config keep-alive for rt suspend

[ Upstream commit ee0b089d660021792e4ab4dda191b097ce1e964f ]

When the new style KAE keep-alive implementation is used on compatible
Intel hardware, the clocks are maintained when codec is in D3. The
generic code in hda_cleanup_all_streams() can however interfere with
generation of audio samples in this mode, by setting the stream and
channel ids to zero.

To get full benefit of the keepalive, set the new
no_stream_clean_at_suspend quirk bit on affected Intel hardware. When
this bit is set, stream cleanup is skipped in hda_call_codec_suspend().

Special handling is needed for the case when system goes to suspend. The
stream id programming can be lost in this case. This will also cause
codec->cvt_setups to be out of sync. Handle this by implementing custom
suspend/resume handlers. If keep-alive is active for any converter, set
the quirk flags no_stream_clean_at_suspend and forced_resume. Upon
resume, keepalive programming is restored if needed.

Fixes: 15175a4f2bbb ("ALSA: hda/hdmi: add keep-alive support for ADL-P and DG2")
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20221209101822.3893675-4-kai.vehmanen@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h
index 684e6131737ea477a3f61d5a4b610f3b531102ec..ec2a2ba21cc39ef965240b8a83f0f5b442694610 100644 (file)
--- a/include/sound/hda_codec.h
+++ b/include/sound/hda_codec.h
@@ -258,6 +258,7 @@ struct hda_codec {
        unsigned int link_down_at_suspend:1; /* link down at runtime suspend */
        unsigned int relaxed_resume:1;  /* don't resume forcibly for jack */
        unsigned int forced_resume:1; /* forced resume for jack */
+       unsigned int no_stream_clean_at_suspend:1; /* do not clean streams at suspend */
 
 #ifdef CONFIG_PM
        unsigned long power_on_acct;

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 384426d7e9ddc7c94e6bae2fa3d1565f1b5b41ee..c853cba7fc2bf55afbaa532d43a5992237b6e0d9 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2893,7 +2893,8 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec)
        snd_hdac_enter_pm(&codec->core);
        if (codec->patch_ops.suspend)
                codec->patch_ops.suspend(codec);
-       hda_cleanup_all_streams(codec);
+       if (!codec->no_stream_clean_at_suspend)
+               hda_cleanup_all_streams(codec);
        state = hda_set_power_state(codec, AC_PWRST_D3);
        update_power_acct(codec, true);
        snd_hdac_leave_pm(&codec->core);

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 36df152b63ba2ae57af5d9f0f3028ad8482a8186..1e44c6b3ecc9b200690f1509efac55f99124c610 100644 (file)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2925,6 +2925,88 @@ static void i915_pin_cvt_fixup(struct hda_codec *codec,
        }
 }
 
+#ifdef CONFIG_PM
+static int i915_adlp_hdmi_suspend(struct hda_codec *codec)
+{
+       struct hdmi_spec *spec = codec->spec;
+       bool silent_streams = false;
+       int pin_idx, res;
+
+       res = generic_hdmi_suspend(codec);
+
+       for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
+               struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
+
+               if (per_pin->silent_stream) {
+                       silent_streams = true;
+                       break;
+               }
+       }
+
+       if (silent_streams && spec->silent_stream_type == SILENT_STREAM_KAE) {
+               /*
+                * stream-id should remain programmed when codec goes
+                * to runtime suspend
+                */
+               codec->no_stream_clean_at_suspend = 1;
+
+               /*
+                * the system might go to S3, in which case keep-alive
+                * must be reprogrammed upon resume
+                */
+               codec->forced_resume = 1;
+
+               codec_dbg(codec, "HDMI: KAE active at suspend\n");
+       } else {
+               codec->no_stream_clean_at_suspend = 0;
+               codec->forced_resume = 0;
+       }
+
+       return res;
+}
+
+static int i915_adlp_hdmi_resume(struct hda_codec *codec)
+{
+       struct hdmi_spec *spec = codec->spec;
+       int pin_idx, res;
+
+       res = generic_hdmi_resume(codec);
+
+       /* KAE not programmed at suspend, nothing to do here */
+       if (!codec->no_stream_clean_at_suspend)
+               return res;
+
+       for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
+               struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
+
+               /*
+                * If system was in suspend with monitor connected,
+                * the codec setting may have been lost. Re-enable
+                * keep-alive.
+                */
+               if (per_pin->silent_stream) {
+                       unsigned int param;
+
+                       param = snd_hda_codec_read(codec, per_pin->cvt_nid, 0,
+                                                  AC_VERB_GET_CONV, 0);
+                       if (!param) {
+                               codec_dbg(codec, "HDMI: KAE: restore stream id\n");
+                               silent_stream_enable_i915(codec, per_pin);
+                       }
+
+                       param = snd_hda_codec_read(codec, per_pin->cvt_nid, 0,
+                                                  AC_VERB_GET_DIGI_CONVERT_1, 0);
+                       if (!(param & (AC_DIG3_KAE << 16))) {
+                               codec_dbg(codec, "HDMI: KAE: restore DIG3_KAE\n");
+                               silent_stream_set_kae(codec, per_pin, true);
+                       }
+               }
+       }
+
+       return res;
+}
+#endif
+
 /* precondition and allocation for Intel codecs */
 static int alloc_intel_hdmi(struct hda_codec *codec)
 {
@@ -3055,8 +3137,14 @@ static int patch_i915_adlp_hdmi(struct hda_codec *codec)
        if (!res) {
                spec = codec->spec;
 
-               if (spec->silent_stream_type)
+               if (spec->silent_stream_type) {
                        spec->silent_stream_type = SILENT_STREAM_KAE;
+
+#ifdef CONFIG_PM
+                       codec->patch_ops.resume = i915_adlp_hdmi_resume;
+                       codec->patch_ops.suspend = i915_adlp_hdmi_suspend;
+#endif
+               }
        }
 
        return res;