From d4518cf22dbbc5609edabf3d912c3862cbdade3b Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 6 Feb 2025 12:12:55 +0200 Subject: [PATCH 1/2] Revert "ASoC: SOF: Intel: hda: Add module parameter to disable display audio bind" This reverts commit 9170f2c205607011f6b0fc63050526ac0424a96b. We should be using the options snd_hda_core gpu_bind=0 to disable GPU binding, this patch is not needed. Signed-off-by: Peter Ujfalusi --- sound/soc/sof/intel/hda.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index e4b310b284058d..dbd654f83f729e 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include "../sof-audio.h" #include "../sof-pci-dev.h" @@ -42,11 +41,6 @@ #include #endif -static bool disable_display_audio_bind; -module_param(disable_display_audio_bind, bool, 0444); -MODULE_PARM_DESC(disable_display_audio_bind, - "Disable i915/Xe display audio component binding"); - /* platform specific devices */ #include "shim.h" @@ -719,9 +713,6 @@ int hda_dsp_probe_early(struct snd_sof_dev *sdev) const struct sof_intel_dsp_desc *chip; int ret = 0; - if (disable_display_audio_bind) - snd_hdac_i915_bind(sof_to_bus(sdev), 0); - if (!sdev->dspless_mode_selected) { /* * detect DSP by checking class/subclass/prog-id information From 7cc6fa822a046c131caa922a14b90c0f5c24ddc1 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Fri, 7 Feb 2025 09:09:44 +0200 Subject: [PATCH 2/2] Revert "[NOT FOR UPSTREAM] ALSA: hdac_i915: add helper to disable GPU bind" This reverts commit 603c3ed1a4e69e2e2d523f779cdacfce06bc7a0b. This is no longer needed as we can use module option: options snd_hda_core gpu_bind=0 Signed-off-by: Peter Ujfalusi --- include/sound/hda_i915.h | 4 ---- sound/hda/hdac_i915.c | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/include/sound/hda_i915.h b/include/sound/hda_i915.h index 8a2bdb216a3166..6b79614a893b90 100644 --- a/include/sound/hda_i915.h +++ b/include/sound/hda_i915.h @@ -10,7 +10,6 @@ #ifdef CONFIG_SND_HDA_I915 void snd_hdac_i915_set_bclk(struct hdac_bus *bus); int snd_hdac_i915_init(struct hdac_bus *bus); -void snd_hdac_i915_bind(struct hdac_bus *bus, int i915_bind); #else static inline void snd_hdac_i915_set_bclk(struct hdac_bus *bus) { @@ -19,9 +18,6 @@ static inline int snd_hdac_i915_init(struct hdac_bus *bus) { return -ENODEV; } -static inline void snd_hdac_i915_bind(struct hdac_bus *bus, int i915_bind) -{ -} #endif static inline int snd_hdac_i915_exit(struct hdac_bus *bus) { diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index fbecc17d70e5b5..e9425213320eae 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -170,19 +170,6 @@ static int i915_gfx_present(struct pci_dev *hdac_pci) return false; } -/** - * snd_hdac_i915_bind - override i915 audio component bind options - * @bus: HDA core bus - * @i915_bind: bind options between sound component and GPU - * 1=always, 0=never, -1=on nomodeset(default)) - */ - -void snd_hdac_i915_bind(struct hdac_bus *bus, int i915_bind) -{ - gpu_bind = i915_bind; -} -EXPORT_SYMBOL_GPL(snd_hdac_i915_bind); - /** * snd_hdac_i915_init - Initialize i915 audio component * @bus: HDA core bus