Skip to content
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

ASoC: Intel: Power down links before turning off display audio power #262

Merged
merged 1 commit into from
Nov 9, 2018
Merged

ASoC: Intel: Power down links before turning off display audio power #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions sound/soc/codecs/hdac_hdmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,11 +2187,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
*/
snd_hdac_codec_read(hdev, hdev->afg, 0, AC_VERB_SET_POWER_STATE,
AC_PWRST_D3);
err = snd_hdac_display_power(bus, false);
if (err < 0) {
dev_err(dev, "Cannot turn on display power on i915\n");
return err;
}

hlink = snd_hdac_ext_bus_get_link(bus, dev_name(dev));
if (!hlink) {
Expand All @@ -2201,7 +2196,13 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)

snd_hdac_ext_bus_link_put(bus, hlink);

return 0;
err = snd_hdac_display_power(bus, false);
if (err < 0) {
dev_err(dev, "Cannot turn off display power on i915\n");
return err;
}

return err;
}

static int hdac_hdmi_runtime_resume(struct device *dev)
Expand Down
12 changes: 6 additions & 6 deletions sound/soc/intel/skylake/skl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,12 @@ static void skl_probe_work(struct work_struct *work)
}
}

/*
* we are done probing so decrement link counts
*/
list_for_each_entry(hlink, &bus->hlink_list, list)
snd_hdac_ext_bus_link_put(bus, hlink);

if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {
err = snd_hdac_display_power(bus, false);
if (err < 0) {
Expand All @@ -824,12 +830,6 @@ static void skl_probe_work(struct work_struct *work)
}
}

/*
* we are done probing so decrement link counts
*/
list_for_each_entry(hlink, &bus->hlink_list, list)
snd_hdac_ext_bus_link_put(bus, hlink);

/* configure PM */
pm_runtime_put_noidle(bus->dev);
pm_runtime_allow(bus->dev);
Expand Down