From a3e9f081179ebb273268e775d9983b5abd3c2cde Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Wed, 17 Jul 2024 12:20:22 +0300 Subject: [PATCH 1/2] Revert "[NOT FOR UPSTREAM] ASoC: SOF: Intel: lnl: temporarily disable GPU bind" This reverts commit 0f49ddebae93cd875a58b89fecdf9dec3801f3ad. Signed-off-by: Kai Vehmanen --- sound/soc/sof/intel/lnl.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sound/soc/sof/intel/lnl.c b/sound/soc/sof/intel/lnl.c index 8ac2dc5db2236d..e3c4b4a0d705f2 100644 --- a/sound/soc/sof/intel/lnl.c +++ b/sound/soc/sof/intel/lnl.c @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -95,12 +94,6 @@ static int lnl_hda_dsp_runtime_resume(struct snd_sof_dev *sdev) return hdac_bus_offload_dmic_ssp(sof_to_bus(sdev), true); } -static int lnl_hda_dsp_probe_early(struct snd_sof_dev *sdev) -{ - snd_hdac_i915_bind(sof_to_bus(sdev), 0); - return hda_dsp_probe_early(sdev); -} - static int lnl_dsp_post_fw_run(struct snd_sof_dev *sdev) { if (sdev->first_boot) { @@ -125,9 +118,6 @@ int sof_lnl_ops_init(struct snd_sof_dev *sdev) /* common defaults */ memcpy(&sof_lnl_ops, &sof_hda_common_ops, sizeof(struct snd_sof_dsp_ops)); - /* probe_early */ - sof_lnl_ops.probe_early = lnl_hda_dsp_probe_early; - /* probe/remove */ if (!sdev->dspless_mode_selected) { sof_lnl_ops.probe = lnl_hda_dsp_probe; From f11bd6986e9fbbd82672c4bb4d0d97487113fe7a Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Wed, 17 Jul 2024 12:22:12 +0300 Subject: [PATCH 2/2] [NOT FOR UPSTREAM] drm/xe/lnl: Drop force_probe requirement The driver is ready for testing with SOF for display audio use-cases, so force_probe requirement can be dropped. Signed-off-by: Kai Vehmanen --- drivers/gpu/drm/xe/xe_pci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index f326dbb1cecd9f..1c77f5e3c50317 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -336,7 +336,6 @@ static const struct xe_device_desc mtl_desc = { static const struct xe_device_desc lnl_desc = { PLATFORM(XE_LUNARLAKE), .has_display = true, - .require_force_probe = true, }; static const struct xe_device_desc bmg_desc __maybe_unused = {