From nobody Mon Feb 9 04:29:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB47CEB64DA for ; Wed, 19 Jul 2023 12:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229825AbjGSMOJ (ORCPT ); Wed, 19 Jul 2023 08:14:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229807AbjGSMOI (ORCPT ); Wed, 19 Jul 2023 08:14:08 -0400 Received: from mblankhorst.nl (lankhorst.se [141.105.120.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D1841B5 for ; Wed, 19 Jul 2023 05:14:05 -0700 (PDT) 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> Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8"; format="flowed" 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: >> =20 >> - 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 >> =20 >> A module option to snd_hdac_i915_init would probably be the least of all= evils >> here. >=20 > Yes, probably it's the easiest option and sufficient. >=20 >=20 > thanks, >=20 > Takashi Hey, Patch below, can be applied immediately iresspective of the other patches. ---->8---------- Selecting CONFIG_DRM selects CONFIG_VIDEO_NOMODESET, which exports=20 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=20 built when CONFIG_SND_HDA_I915 is selected by CONFIG_I915. It's not completely fool proof, as you can boot with "nomodeset=20 i915.modeset=3D1" to make i915 load regardless, or use "i915.force_probe=3D!*" 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