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

Jump to bottom

ALSA: hda: hdac-i915: make i915 timeout configurable #4505

Merged
merged 1 commit into from
Aug 4, 2023
Merged

ALSA: hda: hdac-i915: make i915 timeout configurable #4505

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
7 changes: 5 additions & 2 deletions sound/hda/hdac_i915.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
#include <sound/hda_i915.h>
#include <sound/hda_register.h>

static int hdac_i915_timeout_ms = 60;
module_param(hdac_i915_timeout_ms, int, 0444);
MODULE_PARM_DESC(hdac_i915_timeout_ms, "i915 initialization timeout");

/**
* snd_hdac_i915_set_bclk - Reprogram BCLK for HSW/BDW
* @bus: HDA core bus
Expand Down Expand Up @@ -165,9 +169,8 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
if (!acomp->ops) {
if (!IS_ENABLED(CONFIG_MODULES) ||
!request_module("i915")) {
/* 60s timeout */
wait_for_completion_killable_timeout(&acomp->master_bind_complete,
msecs_to_jiffies(60 * 1000));
msecs_to_jiffies(hdac_i915_timeout_ms * 1000));
}
}
if (!acomp->ops) {
Expand Down