Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 16060
b: refs/heads/master
c: 5809c6c
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jan 3, 2006
1 parent c965aee commit c592e9d
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ded462356886e5f80f6a20b227f7e5cf7cfc5159
refs/heads/master: 5809c6c41ae95ce3f45ad14d31503deb1fa8268a
37 changes: 22 additions & 15 deletions trunk/sound/pci/intel8x0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2396,11 +2396,13 @@ static int snd_intel8x0_free(struct intel8x0 *chip)
/*
* power management
*/
static int intel8x0_suspend(struct snd_card *card, pm_message_t state)
static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state)
{
struct intel8x0 *chip = card->pm_private_data;
struct snd_card *card = pci_get_drvdata(pci);
struct intel8x0 *chip = card->private_data;
int i;

snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
for (i = 0; i < chip->pcm_devs; i++)
snd_pcm_suspend_all(chip->pcm[i]);
/* clear nocache */
Expand All @@ -2415,26 +2417,29 @@ static int intel8x0_suspend(struct snd_card *card, pm_message_t state)
}
}
for (i = 0; i < 3; i++)
if (chip->ac97[i])
snd_ac97_suspend(chip->ac97[i]);
snd_ac97_suspend(chip->ac97[i]);
if (chip->device_type == DEVICE_INTEL_ICH4)
chip->sdm_saved = igetbyte(chip, ICHREG(SDM));

if (chip->irq >= 0)
free_irq(chip->irq, chip);
pci_disable_device(chip->pci);
pci_disable_device(pci);
pci_save_state(pci);
return 0;
}

static int intel8x0_resume(struct snd_card *card)
static int intel8x0_resume(struct pci_dev *pci)
{
struct intel8x0 *chip = card->pm_private_data;
struct snd_card *card = pci_get_drvdata(pci);
struct intel8x0 *chip = card->private_data;
int i;

pci_enable_device(chip->pci);
pci_set_master(chip->pci);
request_irq(chip->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ,
pci_restore_state(pci);
pci_enable_device(pci);
pci_set_master(pci);
request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ,
card->shortname, chip);
chip->irq = pci->irq;
synchronize_irq(chip->irq);
snd_intel8x0_chip_init(chip, 1);

Expand All @@ -2453,8 +2458,7 @@ static int intel8x0_resume(struct snd_card *card)
fill_nocache(chip->bdbars.area, chip->bdbars.bytes, 1);

for (i = 0; i < 3; i++)
if (chip->ac97[i])
snd_ac97_resume(chip->ac97[i]);
snd_ac97_resume(chip->ac97[i]);

/* refill nocache */
if (chip->fix_nocache) {
Expand Down Expand Up @@ -2482,6 +2486,7 @@ static int intel8x0_resume(struct snd_card *card)
iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
}

snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0;
}
#endif /* CONFIG_PM */
Expand Down Expand Up @@ -2800,8 +2805,6 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
return err;
}

snd_card_set_pm_callback(card, intel8x0_suspend, intel8x0_resume, chip);

if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
snd_intel8x0_free(chip);
return err;
Expand Down Expand Up @@ -2889,6 +2892,7 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
snd_card_free(card);
return err;
}
card->private_data = chip;

if ((err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk)) < 0) {
snd_card_free(card);
Expand Down Expand Up @@ -2927,7 +2931,10 @@ static struct pci_driver driver = {
.id_table = snd_intel8x0_ids,
.probe = snd_intel8x0_probe,
.remove = __devexit_p(snd_intel8x0_remove),
SND_PCI_PM_CALLBACKS
#ifdef CONFIG_PM
.suspend = intel8x0_suspend,
.resume = intel8x0_resume,
#endif
};


Expand Down
35 changes: 21 additions & 14 deletions trunk/sound/pci/intel8x0m.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1035,28 +1035,33 @@ static int snd_intel8x0_free(struct intel8x0m *chip)
/*
* power management
*/
static int intel8x0m_suspend(struct snd_card *card, pm_message_t state)
static int intel8x0m_suspend(struct pci_dev *pci, pm_message_t state)
{
struct intel8x0m *chip = card->pm_private_data;
struct snd_card *card = pci_get_drvdata(pci);
struct intel8x0m *chip = card->private_data;
int i;

snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
for (i = 0; i < chip->pcm_devs; i++)
snd_pcm_suspend_all(chip->pcm[i]);
if (chip->ac97)
snd_ac97_suspend(chip->ac97);
pci_disable_device(chip->pci);
snd_ac97_suspend(chip->ac97);
pci_disable_device(pci);
pci_save_state(pci);
return 0;
}

static int intel8x0m_resume(struct snd_card *card)
static int intel8x0m_resume(struct pci_dev *pci)
{
struct intel8x0m *chip = card->pm_private_data;
pci_enable_device(chip->pci);
pci_set_master(chip->pci);
struct snd_card *card = pci_get_drvdata(pci);
struct intel8x0m *chip = card->private_data;

pci_restore_state(pci);
pci_enable_device(pci);
pci_set_master(pci);
snd_intel8x0_chip_init(chip, 0);
if (chip->ac97)
snd_ac97_resume(chip->ac97);
snd_ac97_resume(chip->ac97);

snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0;
}
#endif /* CONFIG_PM */
Expand Down Expand Up @@ -1233,8 +1238,6 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
return err;
}

snd_card_set_pm_callback(card, intel8x0m_suspend, intel8x0m_resume, chip);

if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
snd_intel8x0_free(chip);
return err;
Expand Down Expand Up @@ -1298,6 +1301,7 @@ static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
snd_card_free(card);
return err;
}
card->private_data = chip;

if ((err = snd_intel8x0_mixer(chip, ac97_clock)) < 0) {
snd_card_free(card);
Expand Down Expand Up @@ -1332,7 +1336,10 @@ static struct pci_driver driver = {
.id_table = snd_intel8x0m_ids,
.probe = snd_intel8x0m_probe,
.remove = __devexit_p(snd_intel8x0m_remove),
SND_PCI_PM_CALLBACKS
#ifdef CONFIG_PM
.suspend = intel8x0m_suspend,
.resume = intel8x0m_resume,
#endif
};


Expand Down

0 comments on commit c592e9d

Please sign in to comment.