1 files changed, 32 insertions, 8 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index bb65a124e006..b6b4e71a0b0b 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -62,9 +62,9 @@
 #include <linux/vga_switcheroo.h>
 #include <linux/firmware.h>
 #include "hda_codec.h"
-#include "hda_i915.h"
 #include "hda_controller.h"
 #include "hda_priv.h"
+#include "hda_i915.h"
 
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
@@ -288,6 +288,11 @@ static char *driver_short_names[] = {
         [AZX_DRIVER_GENERIC] = "HD-Audio Generic",
 };
 
+struct hda_intel {
+        struct azx chip;
+};
+
+
 #ifdef CONFIG_X86
 static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on)
 {
@@ -606,6 +611,7 @@ static int azx_suspend(struct device *dev)
                 free_irq(chip->irq, chip);
                 chip->irq = -1;
         }
+
         if (chip->msi)
                 pci_disable_msi(chip->pci);
         pci_disable_device(pci);
@@ -625,8 +631,10 @@ static int azx_resume(struct device *dev)
         if (chip->disabled)
                 return 0;
 
-        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
                 hda_display_power(true);
+                haswell_set_bclk(chip);
+        }
         pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
         if (pci_enable_device(pci) < 0) {
@@ -672,6 +680,7 @@ static int azx_runtime_suspend(struct device *dev)
         azx_clear_irq_pending(chip);
         if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
                 hda_display_power(false);
+
         return 0;
 }
 
@@ -689,8 +698,10 @@ static int azx_runtime_resume(struct device *dev)
         if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
                 return 0;
 
-        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
                 hda_display_power(true);
+                haswell_set_bclk(chip);
+        }
 
         /* Read STATESTS before controller reset */
         status = azx_readw(chip, STATESTS);
@@ -883,6 +894,8 @@ static int register_vga_switcheroo(struct azx *chip)
 static int azx_free(struct azx *chip)
 {
         struct pci_dev *pci = chip->pci;
+        struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
+
         int i;
 
         if ((chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
@@ -930,7 +943,7 @@ static int azx_free(struct azx *chip)
                 hda_display_power(false);
                 hda_i915_exit();
         }
-        kfree(chip);
+        kfree(hda);
 
         return 0;
 }
@@ -1174,6 +1187,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
         static struct snd_device_ops ops = {
                 .dev_free = azx_dev_free,
         };
+        struct hda_intel *hda;
         struct azx *chip;
         int err;
 
@@ -1183,13 +1197,14 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
         if (err < 0)
                 return err;
 
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (!chip) {
-                dev_err(card->dev, "Cannot allocate chip\n");
+        hda = kzalloc(sizeof(*hda), GFP_KERNEL);
+        if (!hda) {
+                dev_err(card->dev, "Cannot allocate hda\n");
                 pci_disable_device(pci);
                 return -ENOMEM;
         }
 
+        chip = &hda->chip;
         spin_lock_init(&chip->reg_lock);
         mutex_init(&chip->open_mutex);
         chip->card = card;
@@ -1375,6 +1390,10 @@ static int azx_first_init(struct azx *chip)
 
         /* initialize chip */
         azx_init_pci(chip);
+
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+                haswell_set_bclk(chip);
+
         azx_init_chip(chip, (probe_only[dev] & 2) == 0);
 
         /* codec detection */
@@ -1656,8 +1675,13 @@ static int azx_probe_continue(struct azx *chip)
                                 "Error request power-well from i915\n");
                         goto out_free;
                 }
+                err = hda_display_power(true);
+                if (err < 0) {
+                        dev_err(chip->card->dev,
+                                "Cannot turn on display power on i915\n");
+                        goto out_free;
+                }
 #endif
-                hda_display_power(true);
         }
 
         err = azx_first_init(chip);