diff -Nru oem-audio-hda-daily-dkms-0.201506300928~ubuntu15.04.1/debian/bzr-builder.manifest oem-audio-hda-daily-dkms-0.201507030801~ubuntu15.04.1/debian/bzr-builder.manifest --- oem-audio-hda-daily-dkms-0.201506300928~ubuntu15.04.1/debian/bzr-builder.manifest 2015-06-30 09:28:43.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201507030801~ubuntu15.04.1/debian/bzr-builder.manifest 2015-07-03 08:01:58.000000000 +0000 @@ -1,5 +1,5 @@ -# bzr-builder format 0.3 deb-version 0.201506300928 -lp:~ubuntu-audio-dev/alsa-driver/dkms-packaging revid:hui.wang@canonical.com-20150618095403-req1o0elxxozfj5h +# bzr-builder format 0.3 deb-version 0.201507030801 +lp:~ubuntu-audio-dev/alsa-driver/dkms-packaging revid:hui.wang@canonical.com-20150703075517-fes002q24bq9j6gg nest-part upstream_pci_hda lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 pci/hda hda-src-from-tree revid:david.henningsson@canonical.com-20150629180431-p5uvd41wlhspqgqn nest-part upstream_hda_core lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 hda hda-src-from-tree/hdacore revid:david.henningsson@canonical.com-20150629180431-p5uvd41wlhspqgqn nest-part upstream_include lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 include include-src-from-tree revid:david.henningsson@canonical.com-20150629180431-p5uvd41wlhspqgqn diff -Nru oem-audio-hda-daily-dkms-0.201506300928~ubuntu15.04.1/debian/changelog oem-audio-hda-daily-dkms-0.201507030801~ubuntu15.04.1/debian/changelog --- oem-audio-hda-daily-dkms-0.201506300928~ubuntu15.04.1/debian/changelog 2015-06-30 09:28:43.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201507030801~ubuntu15.04.1/debian/changelog 2015-07-03 08:01:58.000000000 +0000 @@ -1,8 +1,8 @@ -oem-audio-hda-daily-dkms (0.201506300928~ubuntu15.04.1) vivid; urgency=low +oem-audio-hda-daily-dkms (0.201507030801~ubuntu15.04.1) vivid; urgency=low * Auto build. - -- Launchpad Package Builder Tue, 30 Jun 2015 09:28:43 +0000 + -- Launchpad Package Builder Fri, 03 Jul 2015 08:01:58 +0000 oem-audio-hda-daily-dkms (0.1) trusty; urgency=low diff -Nru oem-audio-hda-daily-dkms-0.201506300928~ubuntu15.04.1/patches-vivid/call_bpo_funcs_for_skylake_and_braswell.patch oem-audio-hda-daily-dkms-0.201507030801~ubuntu15.04.1/patches-vivid/call_bpo_funcs_for_skylake_and_braswell.patch --- oem-audio-hda-daily-dkms-0.201506300928~ubuntu15.04.1/patches-vivid/call_bpo_funcs_for_skylake_and_braswell.patch 2015-06-30 09:28:22.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201507030801~ubuntu15.04.1/patches-vivid/call_bpo_funcs_for_skylake_and_braswell.patch 2015-07-03 08:01:48.000000000 +0000 @@ -1,7 +1,7 @@ Index: oem-audio-hda-daily-0.1/hda_intel.c =================================================================== ---- oem-audio-hda-daily-0.1.orig/hda_intel.c 2015-06-16 16:17:14.996506508 +0800 -+++ oem-audio-hda-daily-0.1/hda_intel.c 2015-06-16 16:19:08.640510752 +0800 +--- oem-audio-hda-daily-0.1.orig/hda_intel.c 2015-07-03 15:47:41.630037430 +0800 ++++ oem-audio-hda-daily-0.1/hda_intel.c 2015-07-03 15:47:41.622037430 +0800 @@ -1209,7 +1209,11 @@ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { if (hda->need_i915_power) @@ -31,9 +31,9 @@ * (for HSW and BDW), we need to abort the probe; Index: oem-audio-hda-daily-0.1/hdacore/hdac_i915.c =================================================================== ---- oem-audio-hda-daily-0.1.orig/hdacore/hdac_i915.c 2015-06-16 16:17:14.996506508 +0800 -+++ oem-audio-hda-daily-0.1/hdacore/hdac_i915.c 2015-06-16 16:17:14.992506508 +0800 -@@ -112,9 +112,9 @@ +--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_i915.c 2015-07-03 15:47:41.630037430 +0800 ++++ oem-audio-hda-daily-0.1/hdacore/hdac_i915.c 2015-07-03 15:49:53.506031914 +0800 +@@ -113,9 +113,9 @@ .get_cdclk_freq = wocompo_get_cdclk_freq, }; @@ -45,7 +45,7 @@ get_power = symbol_request(i915_request_power_well); if (!get_power) { -@@ -138,9 +138,9 @@ +@@ -139,9 +139,9 @@ return 0; } @@ -57,7 +57,7 @@ acomp->ops = NULL; if (get_power) { -@@ -208,10 +208,10 @@ +@@ -209,10 +209,10 @@ static int hdac_component_master_match(struct device *dev, void *data) { /* i915 is the only supported component */ @@ -70,7 +70,7 @@ { struct component_match *match = NULL; struct device *dev = bus->dev; -@@ -234,13 +234,13 @@ +@@ -235,13 +235,13 @@ * Atm, we don't support deferring the component binding, so make sure * i915 is loaded and that the binding successfully completes. */ @@ -86,7 +86,7 @@ return 0; out_master_del: -@@ -248,13 +248,13 @@ +@@ -249,13 +249,13 @@ out_err: kfree(acomp); bus->audio_component = NULL; @@ -103,7 +103,7 @@ { struct device *dev = bus->dev; struct i915_audio_component *acomp = bus->audio_component; -@@ -273,4 +273,18 @@ +@@ -274,4 +274,25 @@ return 0; } @@ -111,21 +111,28 @@ + +int snd_hdac_i915_exit(struct hdac_bus *bus) +{ ++#if UTS_UBUNTU_RELEASE_ABI >= 23 ++ return hda_i915_exit_bpo(bus); ++#else + return hda_i915_exit_wocompo(bus); -+ ++#endif +} EXPORT_SYMBOL_GPL(snd_hdac_i915_exit); + +int snd_hdac_i915_init(struct hdac_bus *bus) +{ ++#if UTS_UBUNTU_RELEASE_ABI >= 23 ++ return hda_i915_init_bpo(bus); ++#else + return hda_i915_init_wocompo(bus); ++#endif + +} +EXPORT_SYMBOL_GPL(snd_hdac_i915_init); Index: oem-audio-hda-daily-0.1/include/hda_i915.h =================================================================== ---- oem-audio-hda-daily-0.1.orig/include/hda_i915.h 2015-06-16 16:17:14.996506508 +0800 -+++ oem-audio-hda-daily-0.1/include/hda_i915.h 2015-06-16 16:17:14.992506508 +0800 +--- oem-audio-hda-daily-0.1.orig/include/hda_i915.h 2015-07-03 15:47:41.630037430 +0800 ++++ oem-audio-hda-daily-0.1/include/hda_i915.h 2015-07-03 15:47:41.626037430 +0800 @@ -10,6 +10,8 @@ int snd_hdac_get_display_clk(struct hdac_bus *bus); int snd_hdac_i915_init(struct hdac_bus *bus); diff -Nru oem-audio-hda-daily-dkms-0.201506300928~ubuntu15.04.1/patches-vivid/no_codec_wake_override.patch oem-audio-hda-daily-dkms-0.201507030801~ubuntu15.04.1/patches-vivid/no_codec_wake_override.patch --- oem-audio-hda-daily-dkms-0.201506300928~ubuntu15.04.1/patches-vivid/no_codec_wake_override.patch 2015-06-30 09:28:22.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201507030801~ubuntu15.04.1/patches-vivid/no_codec_wake_override.patch 2015-07-03 08:01:48.000000000 +0000 @@ -1,17 +1,25 @@ Index: oem-audio-hda-daily-0.1/hdacore/hdac_i915.c =================================================================== ---- oem-audio-hda-daily-0.1.orig/hdacore/hdac_i915.c 2015-05-21 11:17:33.980407924 +0800 -+++ oem-audio-hda-daily-0.1/hdacore/hdac_i915.c 2015-05-21 11:21:19.456413962 +0800 -@@ -31,7 +31,7 @@ +--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_i915.c 2015-07-03 15:36:41.830065025 +0800 ++++ oem-audio-hda-daily-0.1/hdacore/hdac_i915.c 2015-07-03 15:38:33.778060343 +0800 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + #include + #include + #include "../include/hdaudio.h" +@@ -31,7 +32,7 @@ - if (!acomp->ops) + if (!acomp || !acomp->ops) return -ENODEV; - -+#if 0 ++#if UTS_UBUNTU_RELEASE_ABI >= 23 if (!acomp->ops->codec_wake_override) { dev_warn(bus->dev, "Invalid codec wake callback\n"); -@@ -42,7 +42,7 @@ +@@ -42,7 +43,7 @@ enable ? "enable" : "disable"); acomp->ops->codec_wake_override(acomp->dev, enable);