Skip to content

Revert "ASoC: SOF: Intel: hda: Add module parameter to disable displa… #5322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ranj063 merged 2 commits into from
Feb 14, 2025
Merged

Revert "ASoC: SOF: Intel: hda: Add module parameter to disable displa… #5322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4518cf
Revert "ASoC: SOF: Intel: hda: Add module parameter to disable displa…
ujfalusi Feb 6, 2025
7cc6fa8
Revert "[NOT FOR UPSTREAM] ALSA: hdac_i915: add helper to disable GPU…
ujfalusi Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions include/sound/hda_i915.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down
13 changes: 0 additions & 13 deletions sound/hda/hdac_i915.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <sound/soc-acpi-intel-ssp-common.h>
#include <sound/sof.h>
#include <sound/sof/xtensa.h>
#include <sound/hda_i915.h>
#include <sound/hda-mlink.h>
#include "../sof-audio.h"
#include "../sof-pci-dev.h"
Expand All @@ -42,11 +41,6 @@
#include <sound/soc-acpi-intel-match.h>
#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"

Expand Down Expand Up @@ -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
Expand Down
Loading