| Message ID | 20240222170614.884413-2-cezary.rojewski@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ALSA/ASoC: Conditionally skip i915 init and cleanups | expand |
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 <cezary.rojewski@intel.com> > --- > 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
On 2024-02-22 6:24 PM, Ville Syrjälä wrote: > 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. ... >> @@ -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? To my knowledge the opposite is true - while LKFs were shipped in limited number, they still were. I did ask few weeks ago my friends from Windows side about the support and they're still running full-scopes on HDMI endpoints on LKF platforms in their CIs. It seems the drm support is there though. Once you re-boot to linux we get -19 during probe(). In regard to CNL, the commit removing CNL-support left the IDs intact what's very handy to us - we have a lot of spare CNL boards for our validation purposes - CNL-based AudioDSP spans multiple platforms, e.g.: CNL/CFL/WHL/CML. The number of newer boards is lower, unfortunately. Kind regards, Czarek
On Thu, Feb 22, 2024 at 06:53:12PM +0100, Cezary Rojewski wrote: > On 2024-02-22 6:24 PM, Ville Syrjälä wrote: > > 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. > > ... > > > > @@ -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? > > To my knowledge the opposite is true - while LKFs were shipped in limited > number, they still were. I did ask few weeks ago my friends from Windows > side about the support and they're still running full-scopes on HDMI > endpoints on LKF platforms in their CIs. It seems the drm support is there > though. Once you re-boot to linux we get -19 during probe(). > > In regard to CNL, the commit removing CNL-support left the IDs intact what's I would prefer to go the other way around and remove the unused/unsupported IDs entirely and for good. > very handy to us - we have a lot of spare CNL boards for our validation > purposes - CNL-based AudioDSP spans multiple platforms, e.g.: > CNL/CFL/WHL/CML. The number of newer boards is lower, unfortunately. Well, I do see your point here and you are not asking for us to add gfx support back, but only help to have this protection here. However I'm afraid that these entries in the list would only cause further confusion. Couldn't they get defined inside your .c directly as a const deny_list? so when we go there and remove the missing bits of CNL we don't conflict or cause undersired issues to you. > > > Kind regards, > Czarek
On Thu, 22 Feb 2024 21:54:42 +0100, Rodrigo Vivi wrote: > > On Thu, Feb 22, 2024 at 06:53:12PM +0100, Cezary Rojewski wrote: > > On 2024-02-22 6:24 PM, Ville Syrjälä wrote: > > > 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. > > > > ... > > > > > > @@ -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? > > > > To my knowledge the opposite is true - while LKFs were shipped in limited > > number, they still were. I did ask few weeks ago my friends from Windows > > side about the support and they're still running full-scopes on HDMI > > endpoints on LKF platforms in their CIs. It seems the drm support is there > > though. Once you re-boot to linux we get -19 during probe(). > > > > In regard to CNL, the commit removing CNL-support left the IDs intact what's > > I would prefer to go the other way around and remove the unused/unsupported > IDs entirely and for good. > > > very handy to us - we have a lot of spare CNL boards for our validation > > purposes - CNL-based AudioDSP spans multiple platforms, e.g.: > > CNL/CFL/WHL/CML. The number of newer boards is lower, unfortunately. > > Well, I do see your point here and you are not asking for us to add gfx > support back, but only help to have this protection here. > > However I'm afraid that these entries in the list would only cause > further confusion. Couldn't they get defined inside your .c directly as > a const deny_list? so when we go there and remove the missing bits > of CNL we don't conflict or cause undersired issues to you. That makes sense. Maybe drm people would get rid of the dead CNL*() definitions from the header as a cleanup in near future, and we'll hit a trouble. thanks, Takashi
On 2024-02-23 9:47 AM, Takashi Iwai wrote: > On Thu, 22 Feb 2024 21:54:42 +0100, > Rodrigo Vivi wrote: ... >>>>> @@ -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? >>> >>> To my knowledge the opposite is true - while LKFs were shipped in limited >>> number, they still were. I did ask few weeks ago my friends from Windows >>> side about the support and they're still running full-scopes on HDMI >>> endpoints on LKF platforms in their CIs. It seems the drm support is there >>> though. Once you re-boot to linux we get -19 during probe(). >>> >>> In regard to CNL, the commit removing CNL-support left the IDs intact what's >> >> I would prefer to go the other way around and remove the unused/unsupported >> IDs entirely and for good. >> >>> very handy to us - we have a lot of spare CNL boards for our validation >>> purposes - CNL-based AudioDSP spans multiple platforms, e.g.: >>> CNL/CFL/WHL/CML. The number of newer boards is lower, unfortunately. >> >> Well, I do see your point here and you are not asking for us to add gfx >> support back, but only help to have this protection here. >> >> However I'm afraid that these entries in the list would only cause >> further confusion. Couldn't they get defined inside your .c directly as >> a const deny_list? so when we go there and remove the missing bits >> of CNL we don't conflict or cause undersired issues to you. > > That makes sense. Maybe drm people would get rid of the dead CNL*() > definitions from the header as a cleanup in near future, and we'll hit > a trouble. Another, more robust solution could be to expose list of recognized devices by drivers/gpu/drm/i915/i915_pci.c in a header. Rather than guess, as we do in i915_gfx_present(), we would just loop over IDs in such list. As I'm unsure if such solution is viable, what I'll do for now is: send v2 with relevant IDs moved over to sound/ tree, leaving the i915 header alone. Incremental update can be provided later if a neater solution appears on the horizon. Kind regards, Czarek
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 } + }; 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; }
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 <cezary.rojewski@intel.com> --- include/drm/i915_pciids.h | 4 ++++ sound/hda/hdac_i915.c | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)