diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-01-16 10:09:47 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:30:02 -0500 |
commit | 52987656fb3d43192639a7d585feb564c075c864 (patch) | |
tree | e8ac0d6e33e537016710cb380f6678770f9773dc | |
parent | 192b8e3922c916cbacac7e5a190d9412ae39a7ee (diff) |
[ALSA] hda-intel - Add workarounds for STAC codecs
Some machines with STAC codecs seem to have problems (e.g. no audible
playback) when the delay in codec-read routine is too short.
I still don't figure out which command sequence causes this problem
(due to lack of test hardware), but it's known that increasing the
delay fixes. So, added a stupid workaround here temporarily...
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r-- | sound/pci/hda/hda_codec.h | 3 | ||||
-rw-r--r-- | sound/pci/hda/hda_intel.c | 8 | ||||
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 12 |
3 files changed, 21 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 20be7761562d..719e46f6fb36 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
@@ -464,6 +464,9 @@ struct hda_bus { | |||
464 | struct hda_bus_unsolicited *unsol; | 464 | struct hda_bus_unsolicited *unsol; |
465 | 465 | ||
466 | struct snd_info_entry *proc; | 466 | struct snd_info_entry *proc; |
467 | |||
468 | /* misc op flags */ | ||
469 | unsigned int needs_damn_long_delay :1; | ||
467 | }; | 470 | }; |
468 | 471 | ||
469 | /* | 472 | /* |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 5f2c3ca863db..fe07bdff60d0 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -559,8 +559,12 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec) | |||
559 | } | 559 | } |
560 | if (!chip->rirb.cmds) | 560 | if (!chip->rirb.cmds) |
561 | return chip->rirb.res; /* the last value */ | 561 | return chip->rirb.res; /* the last value */ |
562 | udelay(10); | 562 | if (codec->bus->needs_damn_long_delay) |
563 | cond_resched(); | 563 | msleep(2); /* temporary workaround */ |
564 | else { | ||
565 | udelay(10); | ||
566 | cond_resched(); | ||
567 | } | ||
564 | } while (time_after_eq(timeout, jiffies)); | 568 | } while (time_after_eq(timeout, jiffies)); |
565 | 569 | ||
566 | if (chip->msi) { | 570 | if (chip->msi) { |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 1d643b9771a0..24137bc975c4 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -3472,6 +3472,18 @@ static int patch_stac927x(struct hda_codec *codec) | |||
3472 | 3472 | ||
3473 | codec->patch_ops = stac92xx_patch_ops; | 3473 | codec->patch_ops = stac92xx_patch_ops; |
3474 | 3474 | ||
3475 | /* | ||
3476 | * !!FIXME!! | ||
3477 | * The STAC927x seem to require fairly long delays for certain | ||
3478 | * command sequences. With too short delays (even if the answer | ||
3479 | * is set to RIRB properly), it results in the silence output | ||
3480 | * on some hardwares like Dell. | ||
3481 | * | ||
3482 | * The below flag enables the longer delay (see get_response | ||
3483 | * in hda_intel.c). | ||
3484 | */ | ||
3485 | codec->bus->needs_damn_long_delay = 1; | ||
3486 | |||
3475 | return 0; | 3487 | return 0; |
3476 | } | 3488 | } |
3477 | 3489 | ||