Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-11-06 09:38:50 +0100
committerJiri Kosina <jkosina@suse.cz>2017-11-06 09:38:50 +0100
commitd7521f2167251c5ffdfd9952da0f539d4b1e56f6 (patch)
treea25ee09850e6f9d270fbc131f944b33dbf104394
parente4edfa9f8086270fd2d5660bb8b2569a374770e7 (diff)
parent9fccb15a0c7f75a158b080c0a47a1a0651ab8fe5 (diff)
Merge remote-tracking branch 'origin/users/tiwai/SLE15/for-next' into SLE15
-rw-r--r--patches.drivers/ALSA-hda-Add-AZX_DRIVER_SKL-for-simplification160
-rw-r--r--patches.drivers/ALSA-hda-Add-Cannonlake-PCI-ID30
-rw-r--r--patches.drivers/ALSA-hda-Add-hdmi-id-for-a-Geminilake-variant42
-rw-r--r--patches.drivers/ALSA-hda-Fix-forget-to-free-resource-in-error-handli39
-rw-r--r--patches.drivers/ALSA-hda-Remove-superfluous-added-by-printk-conversi34
-rw-r--r--patches.drivers/ALSA-hda-fix-headset-mic-problem-for-Dell-machines-w37
-rw-r--r--patches.drivers/ALSA-hda-program-ICT-bits-to-support-HBR-audio85
-rw-r--r--patches.drivers/ALSA-hda-realtek-Add-support-for-ALC236-ALC3204109
-rw-r--r--patches.drivers/ALSA-hda-realtek-Fix-pincfg-for-Dell-XPS-13-937059
-rw-r--r--patches.drivers/drm-i915-Fix-the-missing-PPAT-cache-attributes-on-CN2
-rw-r--r--patches.drivers/drm-i915-Return-correct-EDP-voltage-swing-table-for-2
-rw-r--r--patches.drivers/drm-i915-cnl-Add-slice-and-subslice-information-to-d2
-rw-r--r--patches.drivers/drm-i915-cnl-Fix-LSPCON-support2
-rw-r--r--patches.drivers/drm-i915-cnl-Fix-PLL-initialization-for-HDMI2
-rw-r--r--patches.drivers/drm-i915-cnl-Fix-PLL-mapping2
-rw-r--r--patches.drivers/drm-i915-cnl-Fix-RMW-on-ddi-vswing-sequence1
-rw-r--r--patches.drivers/drm-i915-cnl-Fix-loadgen-select-programming-on-ddi-v2
-rw-r--r--patches.drivers/drm-i915-cnl-Fix-the-CURSOR_COEFF_MASK-used-in-DDI-V3
-rw-r--r--patches.drivers/drm-i915-cnl-Reprogram-DMC-firmware-after-S3-S4-resu1
-rw-r--r--patches.drivers/drm-i915-cnp-set-min-brightness-from-VBT2
-rw-r--r--series.conf9
-rw-r--r--supported.conf1
22 files changed, 616 insertions, 10 deletions
diff --git a/patches.drivers/ALSA-hda-Add-AZX_DRIVER_SKL-for-simplification b/patches.drivers/ALSA-hda-Add-AZX_DRIVER_SKL-for-simplification
new file mode 100644
index 0000000000..5c72409db0
--- /dev/null
+++ b/patches.drivers/ALSA-hda-Add-AZX_DRIVER_SKL-for-simplification
@@ -0,0 +1,160 @@
+From a4b4793f640b72af3e2bb2a1ad79725c103d5e40 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 14 Jun 2017 07:26:00 +0200
+Subject: [PATCH] ALSA: hda - Add AZX_DRIVER_SKL for simplification
+Git-commit: a4b4793f640b72af3e2bb2a1ad79725c103d5e40
+Patch-mainline: 4.13-rc1
+References: bsc#1052235
+
+We checked the quirks specific to the recent Intel chips by checking
+the PCI IDs manually, but it's becoming messy with lots of IS_SKL()
+and other macros, as the amount accumulated.
+
+For simplification, here the new AZX_DRIVER_SKL type is introduced,
+and check chip->driver_type instead of the manual PCI ID. The short
+name for this is still "HDA Intel PCH", so that it doesn't break the
+existing user-space unnecessarily.
+
+Suggested-by: Vinod Koul <vinod.koul@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/hda_intel.c | 47 ++++++++++++++++++++--------------------------
+ 1 file changed, 21 insertions(+), 26 deletions(-)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -263,6 +263,7 @@ enum {
+ AZX_DRIVER_ICH,
+ AZX_DRIVER_PCH,
+ AZX_DRIVER_SCH,
++ AZX_DRIVER_SKL,
+ AZX_DRIVER_HDMI,
+ AZX_DRIVER_ATI,
+ AZX_DRIVER_ATIHDMI,
+@@ -364,23 +365,13 @@ enum {
+ ((pci)->device == 0x0d0c) || \
+ ((pci)->device == 0x160c))
+
+-#define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170)
+-#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)
+-#define IS_KBL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa171)
+-#define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)
+-#define IS_KBL_H(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa2f0)
+ #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
+-#define IS_BXT_T(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x1a98)
+-#define IS_GLK(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x3198)
+-#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)
+-#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci) || \
+- IS_BXT_T(pci) || IS_KBL(pci) || IS_KBL_LP(pci) || \
+- IS_KBL_H(pci) || IS_GLK(pci) || IS_CFL(pci))
+
+ static char *driver_short_names[] = {
+ [AZX_DRIVER_ICH] = "HDA Intel",
+ [AZX_DRIVER_PCH] = "HDA Intel PCH",
+ [AZX_DRIVER_SCH] = "HDA Intel MID",
++ [AZX_DRIVER_SKL] = "HDA Intel PCH", /* kept old name for compatibility */
+ [AZX_DRIVER_HDMI] = "HDA Intel HDMI",
+ [AZX_DRIVER_ATI] = "HDA ATI SB",
+ [AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",
+@@ -644,13 +635,13 @@ static void hda_intel_init_chip(struct a
+
+ if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+ snd_hdac_set_codec_wakeup(bus, true);
+- if (IS_SKL_PLUS(pci)) {
++ if (chip->driver_type == AZX_DRIVER_SKL) {
+ pci_read_config_dword(pci, INTEL_HDA_CGCTL, &val);
+ val = val & ~INTEL_HDA_CGCTL_MISCBDCGE;
+ pci_write_config_dword(pci, INTEL_HDA_CGCTL, val);
+ }
+ azx_init_chip(chip, full_reset);
+- if (IS_SKL_PLUS(pci)) {
++ if (chip->driver_type == AZX_DRIVER_SKL) {
+ pci_read_config_dword(pci, INTEL_HDA_CGCTL, &val);
+ val = val | INTEL_HDA_CGCTL_MISCBDCGE;
+ pci_write_config_dword(pci, INTEL_HDA_CGCTL, val);
+@@ -1075,9 +1066,11 @@ static int azx_resume(struct device *dev
+ */
+ static int azx_freeze_noirq(struct device *dev)
+ {
++ struct snd_card *card = dev_get_drvdata(dev);
++ struct azx *chip = card->private_data;
+ struct pci_dev *pci = to_pci_dev(dev);
+
+- if (IS_SKL_PLUS(pci))
++ if (chip->driver_type == AZX_DRIVER_SKL)
+ pci_set_power_state(pci, PCI_D3hot);
+
+ return 0;
+@@ -1085,9 +1078,11 @@ static int azx_freeze_noirq(struct devic
+
+ static int azx_thaw_noirq(struct device *dev)
+ {
++ struct snd_card *card = dev_get_drvdata(dev);
++ struct azx *chip = card->private_data;
+ struct pci_dev *pci = to_pci_dev(dev);
+
+- if (IS_SKL_PLUS(pci))
++ if (chip->driver_type == AZX_DRIVER_SKL)
+ pci_set_power_state(pci, PCI_D0);
+
+ return 0;
+@@ -1497,7 +1492,7 @@ static int check_position_fix(struct azx
+ dev_dbg(chip->card->dev, "Using LPIB position fix\n");
+ return POS_FIX_LPIB;
+ }
+- if (IS_SKL_PLUS(chip->pci)) {
++ if (chip->driver_type == AZX_DRIVER_SKL) {
+ dev_dbg(chip->card->dev, "Using SKL position fix\n");
+ return POS_FIX_SKL;
+ }
+@@ -1798,7 +1793,7 @@ static int azx_first_init(struct azx *ch
+ return -ENXIO;
+ }
+
+- if (IS_SKL_PLUS(pci))
++ if (chip->driver_type == AZX_DRIVER_SKL)
+ snd_hdac_bus_parse_capabilities(bus);
+
+ /*
+@@ -2367,31 +2362,31 @@ static const struct pci_device_id azx_id
+ .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+ /* Sunrise Point */
+ { PCI_DEVICE(0x8086, 0xa170),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ /* Sunrise Point-LP */
+ { PCI_DEVICE(0x8086, 0x9d70),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ /* Kabylake */
+ { PCI_DEVICE(0x8086, 0xa171),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ /* Kabylake-LP */
+ { PCI_DEVICE(0x8086, 0x9d71),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ /* Kabylake-H */
+ { PCI_DEVICE(0x8086, 0xa2f0),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+ /* Coffelake */
+ { PCI_DEVICE(0x8086, 0xa348),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE},
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ /* Broxton-P(Apollolake) */
+ { PCI_DEVICE(0x8086, 0x5a98),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+ /* Broxton-T */
+ { PCI_DEVICE(0x8086, 0x1a98),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+ /* Gemini-Lake */
+ { PCI_DEVICE(0x8086, 0x3198),
+- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+ /* Haswell */
+ { PCI_DEVICE(0x8086, 0x0a0c),
+ .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
diff --git a/patches.drivers/ALSA-hda-Add-Cannonlake-PCI-ID b/patches.drivers/ALSA-hda-Add-Cannonlake-PCI-ID
new file mode 100644
index 0000000000..ed3d832ffa
--- /dev/null
+++ b/patches.drivers/ALSA-hda-Add-Cannonlake-PCI-ID
@@ -0,0 +1,30 @@
+From 2357f6f00098a437f9de084c3c34254d20dea789 Mon Sep 17 00:00:00 2001
+From: Guneshwor Singh <guneshwor.o.singh@intel.com>
+Date: Sat, 5 Aug 2017 14:05:46 +0530
+Subject: [PATCH] ALSA: hda: Add Cannonlake PCI ID
+Git-commit: 2357f6f00098a437f9de084c3c34254d20dea789
+Patch-mainline: 4.14-rc1
+References: bsc#1052235
+
+Cannonlake is next generation Intel platform. This commit adds PCI ID for
+it.
+
+Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/hda_intel.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2378,6 +2378,9 @@ static const struct pci_device_id azx_id
+ /* Coffelake */
+ { PCI_DEVICE(0x8086, 0xa348),
+ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
++ /* Cannonlake */
++ { PCI_DEVICE(0x8086, 0x9dc8),
++ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ /* Broxton-P(Apollolake) */
+ { PCI_DEVICE(0x8086, 0x5a98),
+ .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
diff --git a/patches.drivers/ALSA-hda-Add-hdmi-id-for-a-Geminilake-variant b/patches.drivers/ALSA-hda-Add-hdmi-id-for-a-Geminilake-variant
new file mode 100644
index 0000000000..79e8d57799
--- /dev/null
+++ b/patches.drivers/ALSA-hda-Add-hdmi-id-for-a-Geminilake-variant
@@ -0,0 +1,42 @@
+From b9091b1c654953cc9615f282704a6df8e31549cf Mon Sep 17 00:00:00 2001
+From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>
+Date: Wed, 12 Jul 2017 20:12:04 +0530
+Subject: [PATCH] ALSA: hda - Add hdmi id for a Geminilake variant
+Git-commit: b9091b1c654953cc9615f282704a6df8e31549cf
+Patch-mainline: 4.13-rc1
+References: bsc#1052235
+
+Few GLK platform variants report a different vendor id. Add it.
+Also add the missing check for GLK in is_haswell_plus().
+
+Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
+Acked-by: Vinod Koul <vinod.koul@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_hdmi.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -53,9 +53,11 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't
+ #define is_skylake(codec) ((codec)->core.vendor_id == 0x80862809)
+ #define is_broxton(codec) ((codec)->core.vendor_id == 0x8086280a)
+ #define is_kabylake(codec) ((codec)->core.vendor_id == 0x8086280b)
++#define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \
++ ((codec)->core.vendor_id == 0x80862800))
+ #define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \
+ || is_skylake(codec) || is_broxton(codec) \
+- || is_kabylake(codec))
++ || is_kabylake(codec)) || is_geminilake(codec)
+
+ #define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882)
+ #define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883)
+@@ -3845,6 +3847,7 @@ HDA_CODEC_ENTRY(0x80862809, "Skylake HDM
+ HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI", patch_i915_hsw_hdmi),
+ HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI", patch_i915_hsw_hdmi),
+ HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI", patch_i915_glk_hdmi),
++HDA_CODEC_ENTRY(0x80862800, "Geminilake HDMI", patch_i915_glk_hdmi),
+ HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi),
+ HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi),
+ HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI", patch_i915_byt_hdmi),
diff --git a/patches.drivers/ALSA-hda-Fix-forget-to-free-resource-in-error-handli b/patches.drivers/ALSA-hda-Fix-forget-to-free-resource-in-error-handli
new file mode 100644
index 0000000000..0860517542
--- /dev/null
+++ b/patches.drivers/ALSA-hda-Fix-forget-to-free-resource-in-error-handli
@@ -0,0 +1,39 @@
+From 284b4c9289766c6294d4c6292aea565f78215b0e Mon Sep 17 00:00:00 2001
+From: Wang YanQing <udknight@gmail.com>
+Date: Mon, 4 Sep 2017 23:17:09 +0800
+Subject: [PATCH] ALSA: hda: Fix forget to free resource in error handling code path in hda_codec_driver_probe
+Git-commit: 284b4c9289766c6294d4c6292aea565f78215b0e
+Patch-mainline: 4.14-rc1
+References: bsc#1052235
+
+When hda_codec_driver_probe meet error and return failure, we need
+to free resource with patch_ops.free, or we will get resource leak.
+
+Signed-off-by: Wang YanQing <udknight@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/hda_bind.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/hda_bind.c
++++ b/sound/pci/hda/hda_bind.c
+@@ -100,7 +100,7 @@ static int hda_codec_driver_probe(struct
+ if (patch) {
+ err = patch(codec);
+ if (err < 0)
+- goto error_module;
++ goto error_module_put;
+ }
+
+ err = snd_hda_codec_build_pcms(codec);
+@@ -120,6 +120,9 @@ static int hda_codec_driver_probe(struct
+ return 0;
+
+ error_module:
++ if (codec->patch_ops.free)
++ codec->patch_ops.free(codec);
++ error_module_put:
+ module_put(owner);
+
+ error:
diff --git a/patches.drivers/ALSA-hda-Remove-superfluous-added-by-printk-conversi b/patches.drivers/ALSA-hda-Remove-superfluous-added-by-printk-conversi
new file mode 100644
index 0000000000..ef513f6c20
--- /dev/null
+++ b/patches.drivers/ALSA-hda-Remove-superfluous-added-by-printk-conversi
@@ -0,0 +1,34 @@
+From 6bf88a343db2b3c160edf9b82a74966b31cc80bd Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 17 Oct 2017 11:58:17 +0200
+Subject: [PATCH] ALSA: hda: Remove superfluous '-' added by printk conversion
+Git-commit: 6bf88a343db2b3c160edf9b82a74966b31cc80bd
+Patch-mainline: 4.14-rc6
+References: bsc#1052235
+
+While converting the error messages to the standard macros in the
+commit 4e76a8833fac ("ALSA: hda - Replace with standard printk"), a
+superfluous '-' slipped in the code mistakenly. Its influence is
+almost negligible, merely shows a dB value as negative integer instead
+of positive integer (or vice versa) in the rare error message.
+So let's kill this embarrassing byte to show more correct value.
+
+Fixes: 4e76a8833fac ("ALSA: hda - Replace with standard printk")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/hda_codec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/hda_codec.c
++++ b/sound/pci/hda/hda_codec.c
+@@ -1823,7 +1823,7 @@ static int get_kctl_0dB_offset(struct hd
+ return -1;
+ if (*step_to_check && *step_to_check != step) {
+ codec_err(codec, "Mismatching dB step for vmaster slave (%d!=%d)\n",
+-- *step_to_check, step);
++ *step_to_check, step);
+ return -1;
+ }
+ *step_to_check = step;
diff --git a/patches.drivers/ALSA-hda-fix-headset-mic-problem-for-Dell-machines-w b/patches.drivers/ALSA-hda-fix-headset-mic-problem-for-Dell-machines-w
new file mode 100644
index 0000000000..4f83d040d4
--- /dev/null
+++ b/patches.drivers/ALSA-hda-fix-headset-mic-problem-for-Dell-machines-w
@@ -0,0 +1,37 @@
+From f265788c336979090ac80b9ae173aa817c4fe40d Mon Sep 17 00:00:00 2001
+From: Hui Wang <hui.wang@canonical.com>
+Date: Tue, 24 Oct 2017 16:53:34 +0800
+Subject: [PATCH] ALSA: hda - fix headset mic problem for Dell machines with alc236
+Git-commit: f265788c336979090ac80b9ae173aa817c4fe40d
+Patch-mainline: 4.14-rc7
+References: bsc#1052235
+
+We have several Dell laptops which use the codec alc236, the headset
+mic can't work on these machines. Following the commit 736f20a70, we
+add the pin cfg table to make the headset mic work.
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Hui Wang <hui.wang@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -6413,6 +6413,14 @@ static const struct snd_hda_pin_quirk al
+ ALC225_STANDARD_PINS,
+ {0x12, 0xb7a60130},
+ {0x1b, 0x90170110}),
++ SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
++ {0x12, 0x90a60140},
++ {0x14, 0x90170110},
++ {0x21, 0x02211020}),
++ SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
++ {0x12, 0x90a60140},
++ {0x14, 0x90170150},
++ {0x21, 0x02211020}),
+ SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
+ {0x14, 0x90170110},
+ {0x21, 0x02211020}),
diff --git a/patches.drivers/ALSA-hda-program-ICT-bits-to-support-HBR-audio b/patches.drivers/ALSA-hda-program-ICT-bits-to-support-HBR-audio
new file mode 100644
index 0000000000..811259ac1a
--- /dev/null
+++ b/patches.drivers/ALSA-hda-program-ICT-bits-to-support-HBR-audio
@@ -0,0 +1,85 @@
+From 5a5d718f952b55e7fa96bfaf6f31f2c08babd77b Mon Sep 17 00:00:00 2001
+From: Sriram Periyasamy <sriramx.periyasamy@intel.com>
+Date: Tue, 19 Sep 2017 17:25:05 -0500
+Subject: [PATCH] ALSA: hda - program ICT bits to support HBR audio
+Git-commit: 5a5d718f952b55e7fa96bfaf6f31f2c08babd77b
+Patch-mainline: 4.14-rc4
+References: bsc#1052235
+
+On recent Intel platforms (Haswell, Broadwell, Skylake, ApolloLake,
+KabyLake, ...), the IEC Coding Type (ICT) bitfield in the Digital
+Converter Control #3 needs to be set explicitly for HDMI/DisplayPort
+High Bit Rate (HBR) audio playback to work. This was not required in
+earlier platforms when HBR was first introduced. The ICT bits are
+defined in Section 7.3.3.9 of the HDaudio 1.0a specification.
+
+Since the ICT bitfield was not specified for HDAudio 1.0 devices
+(before 2009), we only program it on machines more recent than
+Haswell.
+
+We tested that this fix is not needed on Baytrail-I (MinnowBoard
+Turbot) and believe by extension it also does not apply to Braswell.
+
+[ Moved AC_VERB_SET_DIGI_CONVERT_3 definition to the right place
+ by tiwai ]
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98797
+
+Signed-off-by: Sriram Periyasamy <sriramx.periyasamy@intel.com>
+Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
+Acked-by: Vinod Koul <vinod.koul@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ include/sound/hda_verbs.h | 1 +
+ sound/pci/hda/patch_hdmi.c | 21 +++++++++++++++++++++
+ 2 files changed, 22 insertions(+)
+
+--- a/include/sound/hda_verbs.h
++++ b/include/sound/hda_verbs.h
+@@ -95,6 +95,7 @@ enum {
+ #define AC_VERB_SET_EAPD_BTLENABLE 0x70c
+ #define AC_VERB_SET_DIGI_CONVERT_1 0x70d
+ #define AC_VERB_SET_DIGI_CONVERT_2 0x70e
++#define AC_VERB_SET_DIGI_CONVERT_3 0x73e
+ #define AC_VERB_SET_VOLUME_KNOB_CONTROL 0x70f
+ #define AC_VERB_SET_GPIO_DATA 0x715
+ #define AC_VERB_SET_GPIO_MASK 0x716
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -907,6 +907,7 @@ static int hdmi_setup_stream(struct hda_
+ hda_nid_t pin_nid, u32 stream_tag, int format)
+ {
+ struct hdmi_spec *spec = codec->spec;
++ unsigned int param;
+ int err;
+
+ err = spec->ops.pin_hbr_setup(codec, pin_nid, is_hbr_format(format));
+@@ -916,6 +917,26 @@ static int hdmi_setup_stream(struct hda_
+ return err;
+ }
+
++ if (is_haswell_plus(codec)) {
++
++ /*
++ * on recent platforms IEC Coding Type is required for HBR
++ * support, read current Digital Converter settings and set
++ * ICT bitfield if needed.
++ */
++ param = snd_hda_codec_read(codec, cvt_nid, 0,
++ AC_VERB_GET_DIGI_CONVERT_1, 0);
++
++ param = (param >> 16) & ~(AC_DIG3_ICT);
++
++ /* on recent platforms ICT mode is required for HBR support */
++ if (is_hbr_format(format))
++ param |= 0x1;
++
++ snd_hda_codec_write(codec, cvt_nid, 0,
++ AC_VERB_SET_DIGI_CONVERT_3, param);
++ }
++
+ snd_hda_codec_setup_stream(codec, cvt_nid, stream_tag, 0, format);
+ return 0;
+ }
diff --git a/patches.drivers/ALSA-hda-realtek-Add-support-for-ALC236-ALC3204 b/patches.drivers/ALSA-hda-realtek-Add-support-for-ALC236-ALC3204
new file mode 100644
index 0000000000..ff502b7846
--- /dev/null
+++ b/patches.drivers/ALSA-hda-realtek-Add-support-for-ALC236-ALC3204
@@ -0,0 +1,109 @@
+From 736f20a7060857ff569e9e9586ae6c1204a73e07 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Fri, 20 Oct 2017 15:06:34 +0800
+Subject: [PATCH] ALSA: hda/realtek - Add support for ALC236/ALC3204
+Git-commit: 736f20a7060857ff569e9e9586ae6c1204a73e07
+Patch-mainline: 4.14-rc7
+References: bsc#1052235
+
+Add support for ALC236/ALC3204.
+Add headset mode support for ALC236/ALC3204.
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -330,6 +330,7 @@ static void alc_fill_eapd_coef(struct hd
+ case 0x10ec0215:
+ case 0x10ec0225:
+ case 0x10ec0233:
++ case 0x10ec0236:
+ case 0x10ec0255:
+ case 0x10ec0256:
+ case 0x10ec0282:
+@@ -914,6 +915,7 @@ static struct alc_codec_rename_pci_table
+ { 0x10ec0275, 0x1028, 0, "ALC3260" },
+ { 0x10ec0899, 0x1028, 0, "ALC3861" },
+ { 0x10ec0298, 0x1028, 0, "ALC3266" },
++ { 0x10ec0236, 0x1028, 0, "ALC3204" },
+ { 0x10ec0256, 0x1028, 0, "ALC3246" },
+ { 0x10ec0225, 0x1028, 0, "ALC3253" },
+ { 0x10ec0295, 0x1028, 0, "ALC3254" },
+@@ -3914,6 +3916,7 @@ static void alc_headset_mode_unplugged(s
+ alc_process_coef_fw(codec, coef0255_1);
+ alc_process_coef_fw(codec, coef0255);
+ break;
++ case 0x10ec0236:
+ case 0x10ec0256:
+ alc_process_coef_fw(codec, coef0256);
+ alc_process_coef_fw(codec, coef0255);
+@@ -4012,6 +4015,7 @@ static void alc_headset_mode_mic_in(stru
+ };
+
+ switch (codec->core.vendor_id) {
++ case 0x10ec0236:
+ case 0x10ec0255:
+ case 0x10ec0256:
+ alc_write_coef_idx(codec, 0x45, 0xc489);
+@@ -4144,6 +4148,7 @@ static void alc_headset_mode_default(str
+ alc_process_coef_fw(codec, alc225_pre_hsmode);
+ alc_process_coef_fw(codec, coef0225);
+ break;
++ case 0x10ec0236:
+ case 0x10ec0255:
+ case 0x10ec0256:
+ alc_process_coef_fw(codec, coef0255);
+@@ -4240,6 +4245,7 @@ static void alc_headset_mode_ctia(struct
+ case 0x10ec0255:
+ alc_process_coef_fw(codec, coef0255);
+ break;
++ case 0x10ec0236:
+ case 0x10ec0256:
+ alc_process_coef_fw(codec, coef0256);
+ break;
+@@ -4350,6 +4356,7 @@ static void alc_headset_mode_omtp(struct
+ case 0x10ec0255:
+ alc_process_coef_fw(codec, coef0255);
+ break;
++ case 0x10ec0236:
+ case 0x10ec0256:
+ alc_process_coef_fw(codec, coef0256);
+ break;
+@@ -4435,6 +4442,7 @@ static void alc_determine_headset_type(s
+ };
+
+ switch (codec->core.vendor_id) {
++ case 0x10ec0236:
+ case 0x10ec0255:
+ case 0x10ec0256:
+ alc_process_coef_fw(codec, coef0255);
+@@ -4689,6 +4697,7 @@ static void alc255_set_default_jack_type
+ case 0x10ec0255:
+ alc_process_coef_fw(codec, alc255fw);
+ break;
++ case 0x10ec0236:
+ case 0x10ec0256:
+ alc_process_coef_fw(codec, alc256fw);
+ break;
+@@ -6791,6 +6800,7 @@ static int patch_alc269(struct hda_codec
+ case 0x10ec0255:
+ spec->codec_variant = ALC269_TYPE_ALC255;
+ break;
++ case 0x10ec0236:
+ case 0x10ec0256:
+ spec->codec_variant = ALC269_TYPE_ALC256;
+ spec->shutup = alc256_shutup;
+@@ -7842,6 +7852,7 @@ static const struct hda_device_id snd_hd
+ HDA_CODEC_ENTRY(0x10ec0233, "ALC233", patch_alc269),
+ HDA_CODEC_ENTRY(0x10ec0234, "ALC234", patch_alc269),
+ HDA_CODEC_ENTRY(0x10ec0235, "ALC233", patch_alc269),
++ HDA_CODEC_ENTRY(0x10ec0236, "ALC236", patch_alc269),
+ HDA_CODEC_ENTRY(0x10ec0255, "ALC255", patch_alc269),
+ HDA_CODEC_ENTRY(0x10ec0256, "ALC256", patch_alc269),
+ HDA_CODEC_ENTRY(0x10ec0260, "ALC260", patch_alc260),
diff --git a/patches.drivers/ALSA-hda-realtek-Fix-pincfg-for-Dell-XPS-13-9370 b/patches.drivers/ALSA-hda-realtek-Fix-pincfg-for-Dell-XPS-13-9370
new file mode 100644
index 0000000000..ba05e78928
--- /dev/null
+++ b/patches.drivers/ALSA-hda-realtek-Fix-pincfg-for-Dell-XPS-13-9370
@@ -0,0 +1,59 @@
+From 8df4b0031067758d8b0a3bfde7d35e980d0376d5 Mon Sep 17 00:00:00 2001
+From: "Shih-Yuan Lee (FourDollars)" <sylee@canonical.com>
+Date: Mon, 14 Aug 2017 18:00:47 +0800
+Subject: [PATCH] ALSA: hda/realtek - Fix pincfg for Dell XPS 13 9370
+Git-commit: 8df4b0031067758d8b0a3bfde7d35e980d0376d5
+Patch-mainline: 4.13-rc6
+References: bsc#1052235
+
+The initial pin configs for Dell headset mode of ALC3271 has changed.
+
+/sys/class/sound/hwc0d0/init_pin_configs: (BIOS 0.1.4)
+0x12 0xb7a60130
+0x13 0xb8a61140
+0x14 0x40000000
+0x16 0x411111f0
+0x17 0x90170110
+0x18 0x411111f0
+0x19 0x411111f0
+0x1a 0x411111f0
+0x1b 0x411111f0
+0x1d 0x4087992d
+0x1e 0x411111f0
+0x21 0x04211020
+
+has changed to ...
+
+/sys/class/sound/hwc0d0/init_pin_configs: (BIOS 0.2.0)
+0x12 0xb7a60130
+0x13 0x40000000
+0x14 0x411111f0
+0x16 0x411111f0
+0x17 0x90170110
+0x18 0x411111f0
+0x19 0x411111f0
+0x1a 0x411111f0
+0x1b 0x411111f0
+0x1d 0x4067992d
+0x1e 0x411111f0
+0x21 0x04211020
+
+Fixes: b4576de87243 ("ALSA: hda/realtek - Fix typo of pincfg for Dell quirk")
+Signed-off-by: Shih-Yuan Lee (FourDollars) <sylee@canonical.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -6649,7 +6649,6 @@ static const struct snd_hda_pin_quirk al
+ SND_HDA_PIN_QUIRK(0x10ec0299, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
+ ALC225_STANDARD_PINS,
+ {0x12, 0xb7a60130},
+- {0x13, 0xb8a61140},
+ {0x17, 0x90170110}),
+ {}
+ };
diff --git a/patches.drivers/drm-i915-Fix-the-missing-PPAT-cache-attributes-on-CN b/patches.drivers/drm-i915-Fix-the-missing-PPAT-cache-attributes-on-CN
index 5eb94332be..dfb34898f9 100644
--- a/patches.drivers/drm-i915-Fix-the-missing-PPAT-cache-attributes-on-CN
+++ b/patches.drivers/drm-i915-Fix-the-missing-PPAT-cache-attributes-on-CN
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915: Fix the missing PPAT cache attributes on CNL
Git-commit: a338d5f8765f22e97421eb18a186a4af85d4efb2
Patch-mainline: 4.14-rc1
References: FATE#322643 bsc#1055900
+No-Fix: 6e31cdcfe17d8a25530924183d4a843602baebb1
Add back the GEN8_PPAT_WB cache attributes in cnl_setup_private_ppat(),
which are missed on CNL.
@@ -19,7 +20,6 @@ Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1504208177-27784-1-git-send-email-zhi.a.wang@intel.com
(cherry picked from commit 6e31cdcfe17d8a25530924183d4a843602baebb1)
-
Acked-by: Takashi Iwai <tiwai@suse.de>
---
diff --git a/patches.drivers/drm-i915-Return-correct-EDP-voltage-swing-table-for- b/patches.drivers/drm-i915-Return-correct-EDP-voltage-swing-table-for-
index 8573ef9e3b..6feadf5f86 100644
--- a/patches.drivers/drm-i915-Return-correct-EDP-voltage-swing-table-for-
+++ b/patches.drivers/drm-i915-Return-correct-EDP-voltage-swing-table-for-
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915: Return correct EDP voltage swing table for 0.85V
Git-commit: 7eceb9d04966435ed2d03f5554413715ab3cb34a
Patch-mainline: 4.13-rc6
References: FATE#322643 bsc#1055900
+No-Fix: 50946c89850db13bd672c664aec6cf4551f71fe9
For 0.85V cnl_get_buf_trans_edp() returns the DP table, instead of EDP.
Use the correct table.
@@ -22,7 +23,6 @@ Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170717195854.192139-1-mka@chromium.org
(cherry picked from commit 50946c89850db13bd672c664aec6cf4551f71fe9)
-
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
diff --git a/patches.drivers/drm-i915-cnl-Add-slice-and-subslice-information-to-d b/patches.drivers/drm-i915-cnl-Add-slice-and-subslice-information-to-d
index 1a73f66b66..3bdcc0c988 100644
--- a/patches.drivers/drm-i915-cnl-Add-slice-and-subslice-information-to-d
+++ b/patches.drivers/drm-i915-cnl-Add-slice-and-subslice-information-to-d
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915/cnl: Add slice and subslice information to debugfs.
Git-commit: 1dd7a3e7af70ebdd0cdd937b180726d15a4f0948
Patch-mainline: 4.13-rc6
References: FATE#322643 bsc#1055900
+No-Fix: 7ea1adf30f82a4c0910524ac06f8f1f26281bb23
A missing part to EU slice power gating is the
debugfs interface. This patch actually should have been
@@ -18,7 +19,6 @@ Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170809200702.11236-1-rodrigo.vivi@intel.com
(cherry picked from commit 7ea1adf30f82a4c0910524ac06f8f1f26281bb23)
-
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
diff --git a/patches.drivers/drm-i915-cnl-Fix-LSPCON-support b/patches.drivers/drm-i915-cnl-Fix-LSPCON-support
index 65f0a496f6..2f03406d3f 100644
--- a/patches.drivers/drm-i915-cnl-Fix-LSPCON-support
+++ b/patches.drivers/drm-i915-cnl-Fix-LSPCON-support
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915/cnl: Fix LSPCON support.
Git-commit: 31c1a7b8f966470ce136710a95afcf5822fecef8
Patch-mainline: 4.13-rc7
References: FATE#322643 bsc#1055900
+No-Fix: acf58d4e965d40fc014252292b0911b4c9fe6697
When LSPCON support was extended to CNL
one part was missed on lspcon_init.
@@ -21,7 +22,6 @@ Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170816030403.11368-1-rodrigo.vivi@intel.com
(cherry picked from commit acf58d4e965d40fc014252292b0911b4c9fe6697)
-
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
diff --git a/patches.drivers/drm-i915-cnl-Fix-PLL-initialization-for-HDMI b/patches.drivers/drm-i915-cnl-Fix-PLL-initialization-for-HDMI
index c6fd8cc14f..15c809177a 100644
--- a/patches.drivers/drm-i915-cnl-Fix-PLL-initialization-for-HDMI
+++ b/patches.drivers/drm-i915-cnl-Fix-PLL-initialization-for-HDMI
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915/cnl: Fix PLL initialization for HDMI.
Git-commit: 038daf5556a486cefc7a239ca4528003a5a4ef00
Patch-mainline: 4.14-rc6
References: FATE#322643 bsc#1055900
+No-Fix: 614ee07acfbb55f2debfc3223ffae97fee17ed14
HDMI Mode selection on CNL is on CFGCR0 for that PLL, not
on in a global CTRL1 as it was on SKL.
@@ -25,7 +26,6 @@ Reviewed-by: James Ausmus <james.ausmus@intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171003220859.21352-3-rodrigo.vivi@intel.com
(cherry picked from commit 614ee07acfbb55f2debfc3223ffae97fee17ed14)
-
Acked-by: Takashi Iwai <tiwai@suse.de>
---
diff --git a/patches.drivers/drm-i915-cnl-Fix-PLL-mapping b/patches.drivers/drm-i915-cnl-Fix-PLL-mapping
index 3166adf522..29b2045bc6 100644
--- a/patches.drivers/drm-i915-cnl-Fix-PLL-mapping
+++ b/patches.drivers/drm-i915-cnl-Fix-PLL-mapping
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915/cnl: Fix PLL mapping.
Git-commit: 41e64c1ac73bbc2380d7b85357a4b693043a5ba8
Patch-mainline: 4.14-rc6
References: FATE#322643 bsc#1055900
+No-Fix: 87145d95c3d8297fb74762bd92e022d7f5cc250c
On PLL Enable sequence we need to "Configure DPCLKA_CFGCR0 to turn on
the clock for the DDI and map the DPLL to the DDI"
@@ -25,7 +26,6 @@ Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: James Ausmus <james.ausmus@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171003220859.21352-2-rodrigo.vivi@intel.com
(cherry picked from commit 87145d95c3d8297fb74762bd92e022d7f5cc250c)
-
Acked-by: Takashi Iwai <tiwai@suse.de>
---
diff --git a/patches.drivers/drm-i915-cnl-Fix-RMW-on-ddi-vswing-sequence b/patches.drivers/drm-i915-cnl-Fix-RMW-on-ddi-vswing-sequence
index f50fce189d..ba9f06a30c 100644
--- a/patches.drivers/drm-i915-cnl-Fix-RMW-on-ddi-vswing-sequence
+++ b/patches.drivers/drm-i915-cnl-Fix-RMW-on-ddi-vswing-sequence
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915/cnl: Fix RMW on ddi vswing sequence.
Git-commit: 1f588aeb60b4412019546ce596f179635abc2ac3
Patch-mainline: 4.14-rc1
References: FATE#322643 bsc#1055900
+No-Fix: 33b92c1e1f27078c83920fe2f38144f97536e248
Paulo noticed that we were missing few bits clear
before writing values back to the register on
diff --git a/patches.drivers/drm-i915-cnl-Fix-loadgen-select-programming-on-ddi-v b/patches.drivers/drm-i915-cnl-Fix-loadgen-select-programming-on-ddi-v
index 4b132e1fdd..93f2129332 100644
--- a/patches.drivers/drm-i915-cnl-Fix-loadgen-select-programming-on-ddi-v
+++ b/patches.drivers/drm-i915-cnl-Fix-loadgen-select-programming-on-ddi-v
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915/cnl: Fix loadgen select programming on ddi vswing sequ
Git-commit: 5846a73f26a1efa45e2c2edd36aa2ed0a6ad380a
Patch-mainline: 4.13-rc3
References: FATE#322643 bsc#1055900
+No-Fix: a8e45a1c42d11597e975f3e5f2fe182f90cdaa7f
The condition for setting the Loadgen Select bit of
PORT_TX_DW4 register during DDI Vswing Sequence should be
@@ -21,7 +22,6 @@ Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1500329122-32662-1-git-send-email-manasi.d.navare@intel.com
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit a8e45a1c42d11597e975f3e5f2fe182f90cdaa7f)
-
Acked-by: Takashi Iwai <tiwai@suse.de>
---
diff --git a/patches.drivers/drm-i915-cnl-Fix-the-CURSOR_COEFF_MASK-used-in-DDI-V b/patches.drivers/drm-i915-cnl-Fix-the-CURSOR_COEFF_MASK-used-in-DDI-V
index 1e66411605..d4b047c530 100644
--- a/patches.drivers/drm-i915-cnl-Fix-the-CURSOR_COEFF_MASK-used-in-DDI-V
+++ b/patches.drivers/drm-i915-cnl-Fix-the-CURSOR_COEFF_MASK-used-in-DDI-V
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Prog
Git-commit: c379b897ba1a7f786419e8c36a3438ce856f016a
Patch-mainline: 4.13-rc1
References: FATE#322643 bsc#1055900
+No-Fix: fcace3b9b727e25ffa3f7ad2c96e76b8584a9f3e
The Cursor Coeff is lower 6 bits in the PORT_TX_DW4 register
and hence the CURSOR_COEFF_MASK should be (0x3F << 0)
@@ -15,9 +16,7 @@ Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1498785241-21138-1-git-send-email-manasi.d.navare@intel.com
-
(cherry picked from commit fcace3b9b727e25ffa3f7ad2c96e76b8584a9f3e)
-
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
diff --git a/patches.drivers/drm-i915-cnl-Reprogram-DMC-firmware-after-S3-S4-resu b/patches.drivers/drm-i915-cnl-Reprogram-DMC-firmware-after-S3-S4-resu
index efb66253e7..51c0d1e6ac 100644
--- a/patches.drivers/drm-i915-cnl-Reprogram-DMC-firmware-after-S3-S4-resu
+++ b/patches.drivers/drm-i915-cnl-Reprogram-DMC-firmware-after-S3-S4-resu
@@ -6,6 +6,7 @@ Git-commit: 57522c4c87de20d8f7ad4e142a3a4334066d55ff
Git-repo: git://anongit.freedesktop.org/drm-intel
Patch-mainline: Queued in subsystem maintainer repo
References: FATE#322643 bsc#1055900
+No-Fix: 2a8408e5372503fe4df9b5bbb49fb3af0c212c67
The DMC firmware program memory is lost after S3/S4 system suspend, so
we need to reprogram it during resume.
diff --git a/patches.drivers/drm-i915-cnp-set-min-brightness-from-VBT b/patches.drivers/drm-i915-cnp-set-min-brightness-from-VBT
index b1d5c2f641..0161cde369 100644
--- a/patches.drivers/drm-i915-cnp-set-min-brightness-from-VBT
+++ b/patches.drivers/drm-i915-cnp-set-min-brightness-from-VBT
@@ -5,6 +5,7 @@ Subject: [PATCH] drm/i915/cnp: set min brightness from VBT
Git-commit: 8c7a758873577f0d1bb3f879584338f73e6c6bc3
Patch-mainline: 4.14-rc2
References: FATE#322643 bsc#1055900
+No-Fix: f44e354f857f207cd361269c5e38e1f96e0b616c
Min brightness value from vbt was missing for CNP platform.
This setting have to refer backlight ic spec to restrict
@@ -18,7 +19,6 @@ Signed-off-by: Shawn Lee <shawn.c.lee@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1505279961-16140-1-git-send-email-shawn.c.lee@intel.com
(cherry picked from commit f44e354f857f207cd361269c5e38e1f96e0b616c)
-
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
diff --git a/series.conf b/series.conf
index 43226a8f81..b4e60a2b21 100644
--- a/series.conf
+++ b/series.conf
@@ -5097,6 +5097,15 @@
patches.drivers/ALSA-hda-Abort-capability-probe-at-invalid-register-
patches.drivers/ALSA-hda-realtek-Enable-jack-detection-function-for-
patches.drivers/ALSA-hda-Add-model-string-for-Intel-reference-board-
+ patches.drivers/ALSA-hda-Add-AZX_DRIVER_SKL-for-simplification
+ patches.drivers/ALSA-hda-Add-hdmi-id-for-a-Geminilake-variant
+ patches.drivers/ALSA-hda-Add-Cannonlake-PCI-ID
+ patches.drivers/ALSA-hda-realtek-Fix-pincfg-for-Dell-XPS-13-9370
+ patches.drivers/ALSA-hda-Fix-forget-to-free-resource-in-error-handli
+ patches.drivers/ALSA-hda-program-ICT-bits-to-support-HBR-audio
+ patches.drivers/ALSA-hda-Remove-superfluous-added-by-printk-conversi
+ patches.drivers/ALSA-hda-realtek-Add-support-for-ALC236-ALC3204
+ patches.drivers/ALSA-hda-fix-headset-mic-problem-for-Dell-machines-w
patches.fixes/ALSA-seq-Fix-use-after-free-at-creating-a-port
diff --git a/supported.conf b/supported.conf
index d33e659e8a..4297be719f 100644
--- a/supported.conf
+++ b/supported.conf
@@ -2100,6 +2100,7 @@
drivers/watchdog/w83877f_wdt # Driver for watchdog timer in w83877f chip
drivers/watchdog/w83977f_wdt # W83977F Watchdog Timer Driver for Winbond W83977F I/O Chip
drivers/watchdog/wafer5823wdt # ICP Wafer 5823 Single Board Computer WDT driver
+ drivers/watchdog/wdat_wdt
- drivers/watchdog/wdrtas # watchdog for RTAS on pSeries JS20
drivers/watchdog/wdt_pci # Driver for the ICS PCI-WDT500/501 watchdog cards
drivers/watchdog/xen_wdt # Xen pv watchdog driver