From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 50EACC48BF8 for ; Thu, 22 Feb 2024 17:24:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC2BF10E9BF; Thu, 22 Feb 2024 17:24:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="jkcGKiWK"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDE3010E9BF for ; Thu, 22 Feb 2024 17:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708622652; x=1740158652; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=O3uHuGWYyUwgjvH7biobNF6h6KtGzRh7j+XvF7DazPI=; b=jkcGKiWKcWr9ll+QY7MR1M/QDp14OqcXQ02FesAOz5wWaOUpGvNBiygc maEqpkYtNp8slk7EfRnVvC++jvQiglUuxa3K62V7unT2TJpeuZDXCjDVX 0lNPqBJY0T/MTNQvKT35uITqjJ9ouUTrz/AUf4sEu7GpZEg+aLrZsRaFu zd/zIR8RVPZJrKw7vwFY8/3Ons6Jk1fcDR5RALGJs9tDMZWsN98kvBVN5 9ncOLmH5Z0CVYDTG/QJgCabvNcbnAl9yui1LBoUN/PUDn+pLMniVzr3A3 zBPCGLekke/cwAgPnypwhpPylFk9ZOAK5FAyHHL1OBVQcahpyYLY8efti g==; X-IronPort-AV: E=McAfee;i="6600,9927,10992"; a="14286952" X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="14286952" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Feb 2024 09:24:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10992"; a="827577568" X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="827577568" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga001.jf.intel.com with SMTP; 22 Feb 2024 09:24:06 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 22 Feb 2024 19:24:05 +0200 Date: Thu, 22 Feb 2024 19:24:05 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Cezary Rojewski Cc: broonie@kernel.org, alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, tiwai@suse.com, perex@perex.cz, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tvrtko.ursulin@linux.intel.com, intel-gfx@lists.freedesktop.org, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com Subject: Re: [PATCH 1/4] ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms Message-ID: References: <20240222170614.884413-1-cezary.rojewski@intel.com> <20240222170614.884413-2-cezary.rojewski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240222170614.884413-2-cezary.rojewski@intel.com> X-Patchwork-Hint: comment X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Feb 22, 2024 at 06:06:11PM +0100, Cezary Rojewski wrote: > Commit 78f613ba1efb ("drm/i915: finish removal of CNL") and its friends > removed support for i915 for all CNL-based platforms. HDAudio library, > however, still treats such platforms as valid candidates for i915 > binding. Update query mechanism to reflect changes made in drm tree. > > At the same time, i915 support for LKF-based platforms has not been > provided so remove them from valid binding candidates. > > Link: https://lore.kernel.org/all/20210728215946.1573015-1-lucas.demarchi@intel.com/ > Signed-off-by: Cezary Rojewski > --- > include/drm/i915_pciids.h | 4 ++++ > sound/hda/hdac_i915.c | 18 +++++++++++++++--- > 2 files changed, 19 insertions(+), 3 deletions(-) > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index fcf1849aa47c..04172b541ee7 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -582,6 +582,10 @@ > INTEL_VGA_DEVICE(0x8A51, info), \ > INTEL_VGA_DEVICE(0x8A5D, info) > > +/* LKF */ > +#define INTEL_LKF_IDS(info) \ > + INTEL_VGA_DEVICE(0x9840, info) > + > /* EHL */ > #define INTEL_EHL_IDS(info) \ > INTEL_VGA_DEVICE(0x4541, info), \ > diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c > index 365c36fdf205..07861f9fc491 100644 > --- a/sound/hda/hdac_i915.c > +++ b/sound/hda/hdac_i915.c > @@ -6,6 +6,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -127,15 +128,26 @@ static int i915_component_master_match(struct device *dev, int subcomponent, > /* check whether Intel graphics is present and reachable */ > static int i915_gfx_present(struct pci_dev *hdac_pci) > { > + /* List of known platforms with no i915 support. */ > + static struct pci_device_id denylist[] = { > + INTEL_CNL_IDS(NULL), > + INTEL_LKF_IDS(NULL), > + { 0 } > + }; I thought these don't actually exist in the wild? > struct pci_dev *display_dev = NULL; > > if (!gpu_bind || (gpu_bind < 0 && video_firmware_drivers_only())) > return false; > > for_each_pci_dev(display_dev) { > - if (display_dev->vendor == PCI_VENDOR_ID_INTEL && > - (display_dev->class >> 16) == PCI_BASE_CLASS_DISPLAY && > - connectivity_check(display_dev, hdac_pci)) { > + if (display_dev->vendor != PCI_VENDOR_ID_INTEL || > + (display_dev->class >> 16) != PCI_BASE_CLASS_DISPLAY) > + continue; > + > + if (pci_match_id(denylist, display_dev)) > + continue; > + > + if (connectivity_check(display_dev, hdac_pci)) { > pci_dev_put(display_dev); > return true; > } > -- > 2.25.1 -- Ville Syrjälä Intel