Merge branch 'for-linus' into for-next

Conflicts:
	sound/hda/hdac_i915.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --combined sound/hda/hdac_i915.c
index d0da250,54babe1..6800e0c
--- 1/sound/hda/hdac_i915.c
--- 2/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@@ -118,40 -118,22 +118,40 @@@ int snd_hdac_get_display_clk(struct hda
  }
  EXPORT_SYMBOL_GPL(snd_hdac_get_display_clk);
  
 -/* There is a fixed mapping between audio pin node and display port
 - * on current Intel platforms:
 +/* There is a fixed mapping between audio pin node and display port.
 + * on SNB, IVY, HSW, BSW, SKL, BXT, KBL:
   * Pin Widget 5 - PORT B (port = 1 in i915 driver)
   * Pin Widget 6 - PORT C (port = 2 in i915 driver)
   * Pin Widget 7 - PORT D (port = 3 in i915 driver)
 + *
 + * on VLV, ILK:
 + * Pin Widget 4 - PORT B (port = 1 in i915 driver)
 + * Pin Widget 5 - PORT C (port = 2 in i915 driver)
 + * Pin Widget 6 - PORT D (port = 3 in i915 driver)
   */
 -static int pin2port(hda_nid_t pin_nid)
 +static int pin2port(struct hdac_device *codec, hda_nid_t pin_nid)
  {
 -      if (WARN_ON(pin_nid < 5 || pin_nid > 7))
 +      int base_nid;
 +
 +      switch (codec->vendor_id) {
 +      case 0x80860054: /* ILK */
 +      case 0x80862804: /* ILK */
 +      case 0x80862882: /* VLV */
 +              base_nid = 3;
 +              break;
 +      default:
 +              base_nid = 4;
 +              break;
 +      }
 +
 +      if (WARN_ON(pin_nid <= base_nid || pin_nid > base_nid + 3))
                return -1;
 -      return pin_nid - 4;
 +      return pin_nid - base_nid;
  }
  
  /**
   * snd_hdac_sync_audio_rate - Set N/CTS based on the sample rate
 - * @bus: HDA core bus
 + * @codec: HDA codec
   * @nid: the pin widget NID
   * @rate: the sample rate to set
   *
@@@ -161,15 -143,14 +161,15 @@@
   * This function sets N/CTS value based on the given sample rate.
   * Returns zero for success, or a negative error code.
   */
 -int snd_hdac_sync_audio_rate(struct hdac_bus *bus, hda_nid_t nid, int rate)
 +int snd_hdac_sync_audio_rate(struct hdac_device *codec, hda_nid_t nid, int rate)
  {
 +      struct hdac_bus *bus = codec->bus;
        struct i915_audio_component *acomp = bus->audio_component;
        int port;
  
        if (!acomp || !acomp->ops || !acomp->ops->sync_audio_rate)
                return -ENODEV;
 -      port = pin2port(nid);
 +      port = pin2port(codec, nid);
        if (port < 0)
                return -EINVAL;
        return acomp->ops->sync_audio_rate(acomp->dev, port, rate);
@@@ -178,7 -159,7 +178,7 @@@ EXPORT_SYMBOL_GPL(snd_hdac_sync_audio_r
  
  /**
   * snd_hdac_acomp_get_eld - Get the audio state and ELD via component
 - * @bus: HDA core bus
 + * @codec: HDA codec
   * @nid: the pin widget NID
   * @audio_enabled: the pointer to store the current audio state
   * @buffer: the buffer pointer to store ELD bytes
@@@ -196,17 -177,16 +196,17 @@@
   * thus it may be over @max_bytes.  If it's over @max_bytes, it implies
   * that only a part of ELD bytes have been fetched.
   */
 -int snd_hdac_acomp_get_eld(struct hdac_bus *bus, hda_nid_t nid,
 +int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid,
                           bool *audio_enabled, char *buffer, int max_bytes)
  {
 +      struct hdac_bus *bus = codec->bus;
        struct i915_audio_component *acomp = bus->audio_component;
        int port;
  
        if (!acomp || !acomp->ops || !acomp->ops->get_eld)
                return -ENODEV;
  
 -      port = pin2port(nid);
 +      port = pin2port(codec, nid);
        if (port < 0)
                return -EINVAL;
        return acomp->ops->get_eld(acomp->dev, port, audio_enabled,
@@@ -287,6 -267,18 +287,18 @@@ int snd_hdac_i915_register_notifier(con
  }
  EXPORT_SYMBOL_GPL(snd_hdac_i915_register_notifier);
  
+ /* check whether intel graphics is present */
+ static bool i915_gfx_present(void)
+ {
+       static struct pci_device_id ids[] = {
+               { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
+                 .class = PCI_BASE_CLASS_DISPLAY << 16,
+                 .class_mask = 0xff << 16 },
+               {}
+       };
+       return pci_dev_present(ids);
+ }
+ 
  /**
   * snd_hdac_i915_init - Initialize i915 audio component
   * @bus: HDA core bus
@@@ -306,9 -298,9 +318,12 @@@ int snd_hdac_i915_init(struct hdac_bus 
        struct i915_audio_component *acomp;
        int ret;
  
 +      if (WARN_ON(hdac_acomp))
 +              return -EBUSY;
 +
+       if (!i915_gfx_present())
+               return -ENODEV;
+ 
        acomp = kzalloc(sizeof(*acomp), GFP_KERNEL);
        if (!acomp)
                return -ENOMEM;
@@@ -339,7 -331,6 +354,7 @@@ out_master_del
  out_err:
        kfree(acomp);
        bus->audio_component = NULL;
 +      hdac_acomp = NULL;
        dev_info(dev, "failed to add i915 component master (%d)\n", ret);
  
        return ret;
@@@ -373,7 -364,6 +388,7 @@@ int snd_hdac_i915_exit(struct hdac_bus 
  
        kfree(acomp);
        bus->audio_component = NULL;
 +      hdac_acomp = NULL;
  
        return 0;
  }