Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 30 Apr 2020 17:14:56 +0200
Message-ID: <s5hwo5xj98v.wl-tiwai@suse.de>
From:   Takashi Iwai <tiwai@suse.de>
To:     Alex Deucher <alexdeucher@gmail.com>
Cc:     Nicholas Johnson <nicholas.johnson-opensource@outlook.com.au>,
        "Zhou, David(ChunMing)" <David1.Zhou@amd.com>,
        "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "amd-gfx@lists.freedesktop.org" <amd-gfx@lists.freedesktop.org>,
        Takashi Iwai <tiwai@suse.com>, Lukas Wunner <lukas@wunner.de>,
        "Deucher, Alexander" <Alexander.Deucher@amd.com>,
        "Koenig, Christian" <Christian.Koenig@amd.com>
Subject: Re: [PATCH 0/1] Fiji GPU audio register timeout when in BACO state
In-Reply-To: <CADnq5_Mjb_FnNOzjUfJZ7GSDzi-+Cfc1ZTuqm7UWCWVvY6DU_w@mail.gmail.com>
References: <PSXP216MB0438D2AF96CE0D4F83F48C4D80AE0@PSXP216MB0438.KORP216.PROD.OUTLOOK.COM>
        <MN2PR12MB4488E4909C1488FB507E0BF5F7AF0@MN2PR12MB4488.namprd12.prod.outlook.com>
        <s5ho8rdnems.wl-tiwai@suse.de>
        <PSXP216MB04387BF6B5F8DA84749E5D6F80AF0@PSXP216MB0438.KORP216.PROD.OUTLOOK.COM>
        <CADnq5_M=QEqxuCKjb_qZvFSvwM5eLEFfsepxYYXoouFoe5bn7A@mail.gmail.com>
        <s5h4kt4ojrf.wl-tiwai@suse.de>
        <CADnq5_MMQ5_MjEg=bkJJGMJP53RjB3yxvOW0nUDeWxzg3Q0pVQ@mail.gmail.com>
        <s5hv9lkm49n.wl-tiwai@suse.de>
        <PSXP216MB043899DC52E6C6BF728D77CD80AC0@PSXP216MB0438.KORP216.PROD.OUTLOOK.COM>
        <s5ha72ulp2y.wl-tiwai@suse.de>
        <PSXP216MB043822350CDE9E7EEA37730880AD0@PSXP216MB0438.KORP216.PROD.OUTLOOK.COM>
        <CADnq5_MCQ7xHY=yhNtRW=ze0LRPzxuu-Mm7pD4kFa5R52UrGSw@mail.gmail.com>
        <s5h1ro6jn0v.wl-tiwai@suse.de>
        <CADnq5_Mjb_FnNOzjUfJZ7GSDzi-+Cfc1ZTuqm7UWCWVvY6DU_w@mail.gmail.com>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, 29 Apr 2020 18:19:57 +0200,
Alex Deucher wrote:
> 
> On Wed, Apr 29, 2020 at 12:05 PM Takashi Iwai <tiwai@suse.de> wrote:
> > Well, but the code path there is the runtime PM resume of the audio
> > device and it means that GPU must have been runtime-resumed again
> > beforehand via the device link.  So, it should have worked from the
> > beginning but in reality not -- that is, apparently some inconsistency
> > is found in the initial attempt of the runtime resume...
> 
> Yeah, it should be covered, but I wonder if there is something in the
> ELD update sequence that needs to call pm_runtime_get_sync()?  The ELD
> sequence on AMD GPUs doesn't work the same as on other vendors.  The
> GPU driver has a backdoor into the HDA device's verbs to set update
> the audio state rather than doing it via an ELD buffer update.  We
> still update the ELD buffer for consistency.  Maybe when the GPU
> driver sets the audio state at monitor detection time that triggers an
> interrupt or something on the HDA side which races with the CPU and
> the power down of the GPU.  That still seems unlikely though since the
> runtime pm on the GPU side defaults to a 5 second suspend timer.

I'm not sure whether it's the race between runtime suspend of GPU vs
runtime resume of audio.  My wild guess is rather that it's the timing
GPU notifies to the audio; then the audio driver notifies to
user-space and user-space opens the stream, which in turn invokes the
runtime resume of GPU. But in GPU side, it's still under processing,
so it proceeds before the GPU finishes its initialization job.

Nicholas, could you try the patch below and see whether the problem
still appears?  The patch artificially delays the notification and ELD
update for 300msec.  If this works, it means the timing problem.


thanks,

Takashi

--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -767,6 +767,7 @@ static void check_presence_and_report(struct hda_codec *codec, hda_nid_t nid,
 	if (pin_idx < 0)
 		return;
 	mutex_lock(&spec->pcm_lock);
+	get_pin(spec, pin_idx)->repoll_count = 1;
 	hdmi_present_sense(get_pin(spec, pin_idx), 1);
 	mutex_unlock(&spec->pcm_lock);
 }
@@ -1647,7 +1648,10 @@ static void sync_eld_via_acomp(struct hda_codec *codec,
 				      per_pin->dev_id, &eld->monitor_present,
 				      eld->eld_buffer, ELD_MAX_SIZE);
 	eld->eld_valid = (eld->eld_size > 0);
-	update_eld(codec, per_pin, eld, 0);
+	if (per_pin->repoll_count)
+		schedule_delayed_work(&per_pin->work, msecs_to_jiffies(300));
+	else
+		update_eld(codec, per_pin, eld, 0);
 	mutex_unlock(&per_pin->lock);
 }
 
@@ -1669,6 +1673,11 @@ static void hdmi_repoll_eld(struct work_struct *work)
 	struct hdmi_spec *spec = codec->spec;
 	struct hda_jack_tbl *jack;
 
+	if (codec_has_acomp(codec)) {
+		per_pin->repoll_count = 0;
+		goto check;
+	}
+
 	jack = snd_hda_jack_tbl_get_mst(codec, per_pin->pin_nid,
 					per_pin->dev_id);
 	if (jack)
@@ -1677,6 +1686,7 @@ static void hdmi_repoll_eld(struct work_struct *work)
 	if (per_pin->repoll_count++ > 6)
 		per_pin->repoll_count = 0;
 
+ check:
 	mutex_lock(&spec->pcm_lock);
 	hdmi_present_sense(per_pin, per_pin->repoll_count);
 	mutex_unlock(&spec->pcm_lock);