Skip to content

[NOT FOR UPSTREAM] drm/xe/lnl: Drop force_probe requirement #5110

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
bardliao merged 2 commits into from
Aug 19, 2024
Merged

[NOT FOR UPSTREAM] drm/xe/lnl: Drop force_probe requirement #5110

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
a3e9f08
Revert "[NOT FOR UPSTREAM] ASoC: SOF: Intel: lnl: temporarily disable…
kv2019i Jul 17, 2024
f11bd69
[NOT FOR UPSTREAM] drm/xe/lnl: Drop force_probe requirement
kv2019i Jul 17, 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
1 change: 0 additions & 1 deletion drivers/gpu/drm/xe/xe_pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

@ujfalusi ujfalusi Aug 16, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we have similar patch in linux-next to sherry-pick?

@kv2019i kv2019i Aug 16, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me check, when I submitted this (one month ago), there wasn't anything in linx-next yet. Btw, sherry-picking sounds fun :)

@kv2019i kv2019i Aug 16, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ujfalusi nope, not yet https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/gpu/drm/xe/xe_pci.c#n338 ... still requires force_probe as of linux-next 20240816

};

static const struct xe_device_desc bmg_desc __maybe_unused = {
Expand Down
10 changes: 0 additions & 10 deletions sound/soc/sof/intel/lnl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include <linux/debugfs.h>
#include <linux/firmware.h>
#include <sound/hda_i915.h>
#include <sound/hda_register.h>
#include <sound/sof/ipc4/header.h>
#include <trace/events/sof_intel.h>
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down