On 19/07/2023 19:41, Maarten Lankhorst wrote:

Xe is a new GPU driver that re-uses the display (and sound) code from i915. It's no longer possible to load i915, as the GPU can be driven by the xe driver instead.

The new behavior will return -EPROBE_DEFER, and wait for a compatible driver to be loaded instead of modprobing i915.

Converting all drivers at the same time is a lot of work, instead we will convert each user one by one.

Changes since v1:

• Use dev_err_probe to set a probe reason for debugfs' deferred_devices.

Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com

include/sound/hda_i915.h | 4 ++-- sound/hda/hdac_i915.c | 8 ++++---- sound/pci/hda/hda_intel.c | 2 +- sound/soc/intel/avs/core.c | 2 +- sound/soc/intel/skylake/skl.c | 2 +- sound/soc/sof/intel/hda-codec.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index c32709fa4115f..961fcd3397f40 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -155,7 +155,7 @@ static int i915_gfx_present(struct pci_dev *hdac_pci)

• Returns zero for success or a negative error code.

*/ -int snd_hdac_i915_init(struct hdac_bus *bus) +int snd_hdac_i915_init(struct hdac_bus *bus, bool allow_modprobe) { struct drm_audio_component *acomp; int err; @@ -171,7 +171,7 @@ int snd_hdac_i915_init(struct hdac_bus *bus) acomp = bus->audio_component; if (!acomp) return -ENODEV;

• if (!acomp->ops) {

• if (allow_modprobe && !acomp->ops) { if (!IS_ENABLED(CONFIG_MODULES) || !request_module("i915")) { /* 60s timeout */

@@ -180,9 +180,9 @@ int snd_hdac_i915_init(struct hdac_bus *bus) } } if (!acomp->ops) {

• dev_info(bus->dev, "couldn't bind with audio component\n");
  

• int err = allow_modprobe ? -ENODEV : -EPROBE_DEFER;
  

Add one blank line here.

snd_hdac_acomp_exit(bus);

• return -ENODEV;
  

• return dev_err_probe(bus->dev, err, "couldn't bind with audio component\n");
  

  } return 0;

}