Skip to content

ASoC: SOF: Intel: hda: Add module parameter to disable display audio bind #5263

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
Dec 5, 2024
Merged

ASoC: SOF: Intel: hda: Add module parameter to disable display audio bind #5263

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
5fbf9ed
ASoC: SOF: Intel: hda: Add module parameter to disable display audio …
ujfalusi Dec 4, 2024
2219976
Revert "[NOT FOR UPSTREAM] ASoC: SOF: Intel: lnl: Temporarily disable…
ujfalusi Dec 4, 2024
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
9 changes: 9 additions & 0 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,6 +28,7 @@
#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 @@ -41,6 +42,11 @@
#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 @@ -704,6 +710,9 @@ 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
1 change: 0 additions & 1 deletion sound/soc/sof/intel/hda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,6 @@ extern struct snd_sof_dsp_ops sof_mtl_ops;
int sof_mtl_ops_init(struct snd_sof_dev *sdev);
extern struct snd_sof_dsp_ops sof_lnl_ops;
int sof_lnl_ops_init(struct snd_sof_dev *sdev);
int sof_ptl_ops_init(struct snd_sof_dev *sdev);

extern const struct sof_intel_dsp_desc skl_chip_info;
extern const struct sof_intel_dsp_desc apl_chip_info;
Expand Down
19 changes: 0 additions & 19 deletions sound/soc/sof/intel/lnl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

#include <linux/debugfs.h>
#include <sound/hda_i915.h>
#include <linux/firmware.h>
#include <sound/hda_register.h>
#include <sound/sof/ipc4/header.h>
Expand Down Expand Up @@ -185,24 +184,6 @@ int sof_lnl_ops_init(struct snd_sof_dev *sdev)
};
EXPORT_SYMBOL_NS(sof_lnl_ops_init, SND_SOC_SOF_INTEL_LNL);

static int ptl_hda_dsp_probe_early(struct snd_sof_dev *sdev)
{
snd_hdac_i915_bind(sof_to_bus(sdev), 0);
return hda_dsp_probe_early(sdev);
}

int sof_ptl_ops_init(struct snd_sof_dev *sdev)
{
int ret;

ret = sof_lnl_ops_init(sdev);
if (!ret)
sof_lnl_ops.probe_early = ptl_hda_dsp_probe_early;

return ret;
};
EXPORT_SYMBOL_NS(sof_ptl_ops_init, SND_SOC_SOF_INTEL_LNL);

/* Check if an SDW IRQ occurred */
static bool lnl_dsp_check_sdw_irq(struct snd_sof_dev *sdev)
{
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/pci-ptl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static const struct sof_dev_desc ptl_desc = {
},
.nocodec_tplg_filename = "sof-ptl-nocodec.tplg",
.ops = &sof_lnl_ops,
.ops_init = sof_ptl_ops_init,
.ops_init = sof_lnl_ops_init,
};

/* PCI IDs */
Expand Down
Loading