Skip to content

Commit ce295d8

Browse files
ujfalusiranj063
authored andcommitted
Revert "[NOT FOR UPSTREAM] ASoC: SOF: Intel: lnl: Temporarily disable GPU bind for PTL"
This reverts commit 29821cd. The display audio binding can be disabled with a generic module parameter, there is no longer a need for the patch: options snd-sof-intel-hda-generic disable_display_audio_bind=true Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 9170f2c commit ce295d8

3 files changed

Lines changed: 1 addition & 21 deletions

File tree

sound/soc/sof/intel/hda.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,6 @@ extern struct snd_sof_dsp_ops sof_mtl_ops;
917917
int sof_mtl_ops_init(struct snd_sof_dev *sdev);
918918
extern struct snd_sof_dsp_ops sof_lnl_ops;
919919
int sof_lnl_ops_init(struct snd_sof_dev *sdev);
920-
int sof_ptl_ops_init(struct snd_sof_dev *sdev);
921920

922921
extern const struct sof_intel_dsp_desc skl_chip_info;
923922
extern const struct sof_intel_dsp_desc apl_chip_info;

sound/soc/sof/intel/lnl.c

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88

99
#include <linux/debugfs.h>
10-
#include <sound/hda_i915.h>
1110
#include <linux/firmware.h>
1211
#include <sound/hda_register.h>
1312
#include <sound/sof/ipc4/header.h>
@@ -185,24 +184,6 @@ int sof_lnl_ops_init(struct snd_sof_dev *sdev)
185184
};
186185
EXPORT_SYMBOL_NS(sof_lnl_ops_init, SND_SOC_SOF_INTEL_LNL);
187186

188-
static int ptl_hda_dsp_probe_early(struct snd_sof_dev *sdev)
189-
{
190-
snd_hdac_i915_bind(sof_to_bus(sdev), 0);
191-
return hda_dsp_probe_early(sdev);
192-
}
193-
194-
int sof_ptl_ops_init(struct snd_sof_dev *sdev)
195-
{
196-
int ret;
197-
198-
ret = sof_lnl_ops_init(sdev);
199-
if (!ret)
200-
sof_lnl_ops.probe_early = ptl_hda_dsp_probe_early;
201-
202-
return ret;
203-
};
204-
EXPORT_SYMBOL_NS(sof_ptl_ops_init, SND_SOC_SOF_INTEL_LNL);
205-
206187
/* Check if an SDW IRQ occurred */
207188
static bool lnl_dsp_check_sdw_irq(struct snd_sof_dev *sdev)
208189
{

sound/soc/sof/intel/pci-ptl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static const struct sof_dev_desc ptl_desc = {
4444
},
4545
.nocodec_tplg_filename = "sof-ptl-nocodec.tplg",
4646
.ops = &sof_lnl_ops,
47-
.ops_init = sof_ptl_ops_init,
47+
.ops_init = sof_lnl_ops_init,
4848
};
4949

5050
/* PCI IDs */

0 commit comments

Comments
 (0)