From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78F0317A584; Mon, 30 Sep 2024 06:42:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727678577; cv=none; b=lnRfeQjWGYaPwQ9s7a5wUWAYYzRcfSXPfpbnhMLFGV2+RE5aECgJkY85EujRDoWAkpGhlA8r0pJEluElVnh+4+zGrapMz/CDVSL7v21s13rV2vquexARb2V9v82E6ukyNajhs9k61+udrMrLof9E42kQPojlNxRit2RxHA4aWZo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727678577; c=relaxed/simple; bh=A+CWRfJbySQCyx0FK0y1MC0tWyMCytWMpwlHrnQ0E4s=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=asJAUBENNA2wEy9lbnLClar4iQFJXSRGPXW6IN072OLLmAmyEzH934k6Ct0lRODdRqXJJ6BtS5GZWZcNrie9foN9uCjAqcSyiHL2viYh7dTgDziBP7qRrAv1mZaq6TKu8GQww3DePu+LyPIAajPC3CSvhQxh+sOV1z7M9yXnUgI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=em+CZQ9q; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=iQVN4Uw0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=em+CZQ9q; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=iQVN4Uw0; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="em+CZQ9q"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="iQVN4Uw0"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="em+CZQ9q"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="iQVN4Uw0" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9830E1F7EA; Mon, 30 Sep 2024 06:42:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1727678573; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nGw+qYN6PcNNwyugY1JJEeSRgz7EOFWP/KrmgJgYiPQ=; b=em+CZQ9qR+eVgpdB8iEOwIeOmHX8eCEiVspmQB7u3tY0MUIlH89eUlMqNbtfDoevfb2V99 +E8OWDnWvB7kcQIj73ohtTJFEXRgCHlCke95zd0tf642zzkTcznFZ8NJF7ZXdp5zutySc1 StjzmoHrNOha/bGn+Xpibczu2r4o4tw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1727678573; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nGw+qYN6PcNNwyugY1JJEeSRgz7EOFWP/KrmgJgYiPQ=; b=iQVN4Uw0vhltgLA2nsEFKMOdF+ITv2cddYcB5aORaKHJrvmyvW1//+kZGWNMZ/Vtm4cdWd BmFtg6F7e+XEZTBw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1727678573; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nGw+qYN6PcNNwyugY1JJEeSRgz7EOFWP/KrmgJgYiPQ=; b=em+CZQ9qR+eVgpdB8iEOwIeOmHX8eCEiVspmQB7u3tY0MUIlH89eUlMqNbtfDoevfb2V99 +E8OWDnWvB7kcQIj73ohtTJFEXRgCHlCke95zd0tf642zzkTcznFZ8NJF7ZXdp5zutySc1 StjzmoHrNOha/bGn+Xpibczu2r4o4tw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1727678573; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nGw+qYN6PcNNwyugY1JJEeSRgz7EOFWP/KrmgJgYiPQ=; b=iQVN4Uw0vhltgLA2nsEFKMOdF+ITv2cddYcB5aORaKHJrvmyvW1//+kZGWNMZ/Vtm4cdWd BmFtg6F7e+XEZTBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2BEDB13A8B; Mon, 30 Sep 2024 06:42:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id Gz1uCW1I+mZgdQAAD6G6ig (envelope-from ); Mon, 30 Sep 2024 06:42:53 +0000 Date: Mon, 30 Sep 2024 08:43:46 +0200 Message-ID: <87msjpk5el.wl-tiwai@suse.de> From: Takashi Iwai To: Maxim Mikityanskiy Cc: Takashi Iwai , Jaroslav Kysela , Takashi Iwai , Pierre-Louis Bossart , Kai Vehmanen , Maarten Lankhorst , Peter Ujfalusi , Chaitanya Kumar Borah , Rui Salvaterra , Sui Jingfeng , Bjorn Helgaas , Peter Wu , Lukas Wunner , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ALSA: hda: intel: Fix Optimus when GPU has no sound In-Reply-To: References: <20240904203955.245085-1-maxtram95@gmail.com> <871q1ygov9.wl-tiwai@suse.de> <87wmjndbha.wl-tiwai@suse.de> <87jzfncvm0.wl-tiwai@suse.de> <87ed5vcp23.wl-tiwai@suse.de> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/27.2 Mule/6.0 Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spam-Level: X-Spamd-Result: default: False [-3.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWELVE(0.00)[16]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[suse.de,perex.cz,suse.com,linux.intel.com,intel.com,gmail.com,loongson.cn,google.com,lekensteyn.nl,wunner.de,vger.kernel.org]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid] X-Spam-Score: -3.30 X-Spam-Flag: NO On Sat, 21 Sep 2024 10:10:37 +0200, Maxim Mikityanskiy wrote: > > On Sat, 07 Sep 2024 at 20:10:44 +0200, Takashi Iwai wrote: > > On Sat, 07 Sep 2024 19:24:41 +0200, > > Maxim Mikityanskiy wrote: > > > > > > On Sat, 07 Sep 2024 at 17:49:11 +0200, Takashi Iwai wrote: > > > > On Sat, 07 Sep 2024 15:45:41 +0200, > > > > Maxim Mikityanskiy wrote: > > > > > > > > > > On Sat, 07 Sep 2024 at 12:06:25 +0200, Takashi Iwai wrote: > > > > > > On Fri, 06 Sep 2024 20:05:06 +0200, > > > > > > Maxim Mikityanskiy wrote: > > > > > > > > > > > > > > On Thu, 05 Sep 2024 at 16:24:26 +0200, Takashi Iwai wrote: > > > > > > > > On Wed, 04 Sep 2024 22:39:55 +0200, > > > > > > > > Maxim Mikityanskiy wrote: > > > > > > > > > > > > > > > > > > Lenovo IdeaPad Z570 with NVIDIA GeForce Ge 520M doesn't have sound on > > > > > > > > > > > > > > Spotted a typo: s/520M/540M/ > > > > > > > > > > > > > > > > the discrete GPU. snd_hda_intel probes the device and schedules > > > > > > > > > azx_probe_continue(), which fails at azx_first_init(). The driver ends > > > > > > > > > up probed, but calls azx_free() and stops the chip. However, from the > > > > > > > > > runtime PM point of view, the device remains active, because the PCI > > > > > > > > > subsystem makes it active on probe, and it's still bound. It prevents > > > > > > > > > vga_switcheroo from turning off the DGPU (pci_create_device_link() syncs > > > > > > > > > power management for the video and audio devices). > > > > > > > > > > > > > > > > > > Fix it by forcing the device to the suspended state in azx_free(). > > > > > > > > > > > > > > > > > > Fixes: 07f4f97d7b4b ("vga_switcheroo: Use device link for HDA controller") > > > > > > > > > Signed-off-by: Maxim Mikityanskiy > > > > > > > > > > > > > > > > What if this device probe is skipped (e.g. adding your device entry to > > > > > > > > driver_denylist[] in hda_intel.c)? Is the device also in the > > > > > > > > runtime-suspended state? > > > > > > > > > > > > > > I added the following: > > > > > > > > > > > > > > { PCI_DEVICE_SUB(0x10de, 0x0bea, 0x0000, 0x0000) }, > > > > > > > > > > > > > > The probe was apparently skipped (the device is not attached to a > > > > > > > driver), runtime_status=suspended, runtime_usage=0, the GPU goes to > > > > > > > DynOff. > > > > > > > > > > > > OK, that's good. > > > > > > > > > > > > > However, I'm not sure whether it's a good idea to blacklist 540M > > > > > > > entirely, as there might be other laptops with this GPU that have sound, > > > > > > > and AFAIK there are variants of Lenovo Z570 with other NVIDIA GPUs. > > > > > > > > > > > > You should specify the PCI SSID of your device instead of 0:0 in the > > > > > > above, so that it's picked up only for yours. > > > > > > > > > > Where can I get it? > > > > > > > > > > # cat /sys/bus/pci/devices/0000\:01\:00.1/subsystem_vendor > > > > > 0x0000 > > > > > # cat /sys/bus/pci/devices/0000\:01\:00.1/subsystem_device > > > > > 0x0000 > > > > > > > > Ouch, Lenovo didn't set it right. > > > > Alternatively we may introduce a deny list based on DMI. Hmm... > > > > > > A DMI-based quirk sounds better than blocking any NVIDIA 540M, it would > > > also allow handling alternative GPUs on this laptop model. > > > > > > But could you explain what's wrong with a generic approach that I > > > suggest (probe_continue failed => mark as suspended)? It doesn't require > > > any lists. Any drawbacks? > > > > As you noticed, it will leave the device bound with driver, i.e. this > > looks as if it were operative. It means that the sound driver is > > still responsible for suspend/resume or whatever action even though > > it's totally useless. In that sense, it makes more sense to give it > > away at the early stage before actually binding it, and the deny list > > is exactly for that. > > Thanks for your feedback! Sorry for the late reply, as I've been off in the last weeks. > Do you happen to know whether there is a way for a driver to unbind > itself after probe() returned success? I've never seen anything like > this, but it would be a perfect solution: no lists and no driver bound > after the delayed initialization fails. I don't think it's possible for now (at least in a clean way). It should be a call of device_driver_detach(), but it's no exported API. > > Apart from that, the suggested change itself can be applied > > independently from the deny list update, too. It'd be good for other > > similar devices, too. > > I was trying to avoid lists, because it's a maintainance nightmare (the > lists are never complete, there might be false positives, etc.), and > we'd need to add another type of a list for DMI quirks. Moreover, adding > both my change and a list entry has a drawback that similarly broken > devices will use different workaround code (i.e. less robust), and the > ones that use the generic fallback will never get on the list, because > no one will report it. > > As a maintainer, what's your preferred approach? > > 1. Unbind ourselves on failure in azx_probe_continue() (but I don't know > whether it's possible). So it's no easy way. > 2. Add a DMI deny list to hda_intel. > > 3. Add a DMI check to quirk_nvidia_hda (i.e. don't enable a non-existent > HDA if it's not enabled by BIOS on this laptop model). I'm afraid that it may break other systems; IIRC, the power up was needed explicitly even if it's disabled on BIOS. > 4. Driver becomes a stub no failure in azx_probe_continue() (this > patch). It's OK, but slightly risky. It's kept bound, hence any unexpected thing might happen if the code is changed without noticing it. > 5. Some combo of 4 and 2/3? Not safe. So, from the safety POV, I'd rather take the DMI deny list approach. thanks, Takashi > > Though, a slight concern is the sequence of runtime PM you applied in > > the patch. Is it a standard idiom to perform pm_runtime_disable(), > > set_suspended() and enable()? > > I'm not an expert in PM. Before I wrote this code, I was meditating on > the docs for a few hours, and what I understood was: > > 1. As we are disabling the device (below in the same function), we need > set_suspended() to just update the state. > > 2. set_suspended() must be called with PM disabled (see the comment > above the function). > > 3. Disable and enable must come in pairs, because there is refcounting. > > I've seen set_suspended() after disable() on device remove (e.g., > rt9120_remove()). For hda_intel, assuming that disable/enable are > already paired, adding a new disable without a matching enable would > break refcounting. Hence such a sequence. > > I'd love to hear an opinion from someone more experienced in PM. > > > Also, azx_free() is the common > > destructor, hence it's called also at the regular driver unbinding. > > I'm not entirely sure whether it's OK to call there also at > > unbinding. > > I don't have hardware to test this flow, but theoretically it looks OK > to me: we set the suspended state as we disable the device. > > > > > thanks, > > > > Takashi > > > > > > > > > > > > > > > > > Takashi > > > > > > > > > > > > > > > > > > Is it not the right place? > > > > > > > > > > > > > > > > > Takashi > > > > > > > > > > > > > Another way to make vga_switcheroo work is to disable quirk_nvidia_hda, > > > > > > > although I don't know whether it can be done without recompiling the > > > > > > > kernel. In this case, 0000:01:00.1 doesn't even appear on the bus. > > > > > > > > > > > > > > (Note that I need to set nouveau.modeset=2 either way, otherwise it > > > > > > > stays in DynPwr if the screen is on.) > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > thanks, > > > > > > > > > > > > > > > > Takashi > > > > > > > > > > > > > > > > > --- > > > > > > > > > sound/pci/hda/hda_intel.c | 14 +++++++++++++- > > > > > > > > > 1 file changed, 13 insertions(+), 1 deletion(-) > > > > > > > > > > > > > > > > > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > > > > > > > > > index b79020adce63..65fcb92e11c7 100644 > > > > > > > > > --- a/sound/pci/hda/hda_intel.c > > > > > > > > > +++ b/sound/pci/hda/hda_intel.c > > > > > > > > > @@ -1361,8 +1361,20 @@ static void azx_free(struct azx *chip) > > > > > > > > > if (use_vga_switcheroo(hda)) { > > > > > > > > > if (chip->disabled && hda->probe_continued) > > > > > > > > > snd_hda_unlock_devices(&chip->bus); > > > > > > > > > - if (hda->vga_switcheroo_registered) > > > > > > > > > + if (hda->vga_switcheroo_registered) { > > > > > > > > > vga_switcheroo_unregister_client(chip->pci); > > > > > > > > > + > > > > > > > > > + /* Some GPUs don't have sound, and azx_first_init fails, > > > > > > > > > + * leaving the device probed but non-functional. As long > > > > > > > > > + * as it's probed, the PCI subsystem keeps its runtime > > > > > > > > > + * PM status as active. Force it to suspended (as we > > > > > > > > > + * actually stop the chip) to allow GPU to suspend via > > > > > > > > > + * vga_switcheroo. > > > > > > > > > + */ > > > > > > > > > + pm_runtime_disable(&pci->dev); > > > > > > > > > + pm_runtime_set_suspended(&pci->dev); > > > > > > > > > + pm_runtime_enable(&pci->dev); > > > > > > > > > + } > > > > > > > > > } > > > > > > > > > > > > > > > > > > if (bus->chip_init) { > > > > > > > > > -- > > > > > > > > > 2.46.0 > > > > > > > > >