← Back to branch summary

~hui.wang/alsa-driver/dkms-packaging.sof

« back to all changes in this revision

Viewing changes to patches-wily/sync_audio_rate.patch

  • Committer: Hui Wang
  • Date: 2016-03-23 09:34:10 UTC
  • Revision ID: hui.wang@canonical.com-20160323093410-o75bahsmrr6jsqaj
fix sync_audio_rate patch conflict for trusty, utopic, vivid and wily. (sync_audio_rate.patch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches-wily/sync_audio_rate.patch
1
1
Index: oem-audio-hda-daily-0.1/patch_hdmi.c
2
2
===================================================================
3
 
--- oem-audio-hda-daily-0.1.orig/patch_hdmi.c   2016-03-21 15:19:02.057666207 +0800
4
 
+++ oem-audio-hda-daily-0.1/patch_hdmi.c        2016-03-21 15:29:39.381639553 +0800
 
3
--- oem-audio-hda-daily-0.1.orig/patch_hdmi.c   2016-03-23 17:28:28.321690745 +0800
 
4
+++ oem-audio-hda-daily-0.1/patch_hdmi.c        2016-03-23 17:29:41.289687352 +0800
5
5
@@ -160,11 +160,14 @@
6
6
 };
7
7
 
17
17
 #else
18
18
 #define codec_has_acomp(codec) false
19
19
 #endif
20
 
@@ -1484,9 +1487,11 @@
21
 
        int size;
 
20
@@ -1485,9 +1488,11 @@
22
21
 
23
22
        mutex_lock(&per_pin->lock);
 
23
        eld->monitor_present = false;
24
24
+#if 0
25
25
        size = snd_hdac_acomp_get_eld(&codec->bus->core, per_pin->pin_nid,
26
26
                                      &eld->monitor_present, eld->eld_buffer,
27
27
                                      ELD_MAX_SIZE);
28
28
+#endif
29
 
        if (size < 0)
30
 
                goto unlock;
31
29
        if (size > 0) {
32
 
@@ -1741,9 +1746,10 @@
 
30
                size = min(size, ELD_MAX_SIZE);
 
31
                if (snd_hdmi_parse_eld(codec, &eld->info,
 
32
@@ -1740,9 +1745,10 @@
33
33
 
34
34
        /* Call sync_audio_rate to set the N/CTS/M manually if necessary */
35
35
        /* Todo: add DP1.2 MST audio support later */
43
43
        per_pin->channels = substream->runtime->channels;
44
44
Index: oem-audio-hda-daily-0.1/hdacore/hdac_i915.c
45
45
===================================================================
46
 
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_i915.c    2016-03-21 15:19:02.057666207 +0800
47
 
+++ oem-audio-hda-daily-0.1/hdacore/hdac_i915.c 2016-03-21 15:19:02.057666207 +0800
 
46
--- oem-audio-hda-daily-0.1.orig/hdacore/hdac_i915.c    2016-03-23 17:28:28.321690745 +0800
 
47
+++ oem-audio-hda-daily-0.1/hdacore/hdac_i915.c 2016-03-23 17:28:28.321690745 +0800
48
48
@@ -143,6 +143,7 @@
49
49
  * This function sets N/CTS value based on the given sample rate.
50
50
  * Returns zero for success, or a negative error code.