← Back to branch summary

~ubuntu-audio-dev/alsa-driver/dkms-packaging

« back to all changes in this revision

Viewing changes to patches-bionic/hda_intel.patch

  • Committer: Hui Wang
  • Date: 2019-04-12 04:16:23 UTC
  • Revision ID: hui.wang@canonical.com-20190412041623-kmqx89vrf56e3v9m
build error since API changed for bionic

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches-bionic/hda_intel.patch
2
2
===================================================================
3
3
--- oem-audio-hda-daily-0.1.orig/hda_intel.c
4
4
+++ oem-audio-hda-daily-0.1/hda_intel.c
5
 
@@ -58,12 +58,12 @@
 
5
@@ -58,14 +58,16 @@
6
6
 #endif
7
7
 #include <sound/core.h>
8
8
 #include <sound/initval.h>
17
17
+#include <dkms/sound/hda_codec.h>
18
18
 #include "hda_controller.h"
19
19
 #include "hda_intel.h"
 
20
+#include <linux/vermagic.h>
 
21
+
20
22
 
21
 
@@ -80,6 +80,8 @@ enum {
 
23
 #define CREATE_TRACE_POINTS
 
24
 #include "hda_intel_trace.h"
 
25
@@ -80,6 +82,8 @@ enum {
22
26
        POS_FIX_SKL,
23
27
 };
24
28
 
27
31
 /* Defines for ATI HD Audio support in SB450 south bridge */
28
32
 #define ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR   0x42
29
33
 #define ATI_SB450_HDAUDIO_ENABLE_SNOOP      0x02
30
 
@@ -1259,7 +1261,7 @@ static void init_vga_switcheroo(struct a
 
34
@@ -1259,7 +1263,7 @@ static void init_vga_switcheroo(struct a
31
35
 static const struct vga_switcheroo_client_ops azx_vs_ops = {
32
36
        .set_gpu_state = azx_vs_set_state,
33
37
        .can_switch = azx_vs_can_switch,
36
40
 };
37
41
 
38
42
 static int register_vga_switcheroo(struct azx *chip)
39
 
@@ -2001,7 +2003,7 @@ static int dma_alloc_pages(struct hdac_b
 
43
@@ -1272,7 +1276,11 @@ static int register_vga_switcheroo(struc
 
44
                return 0;
 
45
 
 
46
        p = get_bound_vga(chip->pci);
 
47
+#if UTS_UBUNTU_RELEASE_ABI >= 33
 
48
        err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops, p);
 
49
+#else
 
50
+       err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops, VGA_SWITCHEROO_DIS);
 
51
+#endif
 
52
        pci_dev_put(p);
 
53
 
 
54
        if (err < 0)
 
55
@@ -2001,7 +2009,7 @@ static int dma_alloc_pages(struct hdac_b
40
56
        struct azx *chip = bus_to_azx(bus);
41
57
 
42
58
        if (!azx_snoop(chip) && type == SNDRV_DMA_TYPE_DEV)