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@xxxxxxxxx/
> Signed-off-by: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
> ---
> 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 <linux/init.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> +#include <drm/i915_pciids.h>
> #include <sound/core.h>
> #include <sound/hdaudio.h>
> #include <sound/hda_i915.h>
> @@ -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
