From patchwork Wed Jul 19 12:13:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Lankhorst X-Patchwork-Id: 13319000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 62FC9C001DE for ; Wed, 19 Jul 2023 13:25:31 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 4F926206; Wed, 19 Jul 2023 15:24:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4F926206 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1689773129; bh=ZLLTSx0IzKCM/an51/aXKuOB95zBOZBM8T9n0lJWTy0=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=ikn0XNxHDubvVHS5JINebea7YGpDxGKBe50ve2/xW59/ZqkWhqOZfZxpRE+5ATBIz jFaTm0rRz6flfifs/IvczG57DNzmpvsXAh8e0L7pO0wy6Yg8NEyhrHWZvhwRNtERUr vdDiaRkbTI5Xbxv8ILR99OzHTJFyqou5Y84ZZuY8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5A6BFF80544; Wed, 19 Jul 2023 15:23:50 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id D8893F80549; Wed, 19 Jul 2023 15:23:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 82B58F8047D; Wed, 19 Jul 2023 14:14:12 +0200 (CEST) Received: from mblankhorst.nl (lankhorst.se [IPv6:2a02:2308:0:7ec:e79c:4e97:b6c4:f0ae]) (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 alsa1.perex.cz (Postfix) with ESMTPS id C93CDF800D2; Wed, 19 Jul 2023 14:14:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C93CDF800D2 Message-ID: <2ed288d0-c8fe-1856-dbe9-74f4f7c075ba@linux.intel.com> Date: Wed, 19 Jul 2023 14:13:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [PATCH] ASoC: SOF: Intel: Remove deferred probe for SOF Content-Language: en-US To: Takashi Iwai Cc: Kai Vehmanen , Alsa-devel , sound-open-firmware@alsa-project.org, linux-kernel@vger.kernel.org, Jaroslav Kysela , Takashi Iwai , Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Mark Brown , Daniel Baluta , Matthew Auld References: <20230718084522.116952-1-maarten.lankhorst@linux.intel.com> <20230718084522.116952-7-maarten.lankhorst@linux.intel.com> <874jm0modf.wl-tiwai@suse.de> <66d22637-069f-5262-2249-6041ef9d4614@linux.intel.com> <875y6g5feo.wl-tiwai@suse.de> From: Maarten Lankhorst In-Reply-To: <875y6g5feo.wl-tiwai@suse.de> X-MailFrom: maarten.lankhorst@linux.intel.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1 Message-ID-Hash: IT62ZFUE7436KRXVMCS2CQLYCXBEMNLL X-Message-ID-Hash: IT62ZFUE7436KRXVMCS2CQLYCXBEMNLL X-Mailman-Approved-At: Wed, 19 Jul 2023 13:23:45 +0000 X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 2023-07-19 13:06, Takashi Iwai wrote: > On Wed, 19 Jul 2023 11:48:06 +0200, > Maarten Lankhorst wrote: >> >> The 60 seconds timeout is a thing "better than complete disablement", >> so it's not ideal, either. Maybe we can add something like the >> following: >> >> - Check when the deferred probe takes too long, and warn it >> - Provide some runtime option to disable the component binding, so >> that user can work around it if needed >> >> A module option to snd_hdac_i915_init would probably be the least of all evils >> here. > > Yes, probably it's the easiest option and sufficient. > > > thanks, > > Takashi Hey, Patch below, can be applied immediately iresspective of the other patches. ---->8---------- Selecting CONFIG_DRM selects CONFIG_VIDEO_NOMODESET, which exports video_firmware_drivers_only(). This can be used as a first approximation on whether i915 will be available. It's safe to use as this is only built when CONFIG_SND_HDA_I915 is selected by CONFIG_I915. It's not completely fool proof, as you can boot with "nomodeset i915.modeset=1" to make i915 load regardless, or use "i915.force_probe=!*" to never load i915, but the common case of booting with nomodeset to disable all GPU drivers this will work as intended. Signed-off-by: Maarten Lankhorst diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 1637dc6e630a6..90bcf84f7b2ce 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -11,6 +11,8 @@ #include #include +#include