Merge commit 'd1fa230a' of git://people.freedesktop.org/~vivijim/linux-firmware-i915

Signed-off-by: Kyle McMartin <kyle@kernel.org>

diff --git a/WHENCE b/WHENCE
index b62fa43a57a9fc6265627f0e3f449aed10492330..83dd55ce5f772f418e31b071774790043c70a93e 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -2836,23 +2836,28 @@ Licence: Redistributable. See LICENCE.cavium for details
 
 Driver: i915 -- Intel Integrated Graphics driver
 
-File: i915/skl_dmc_ver1_04.bin
-File: i915/skl_dmc_ver1_16.bin
-File: i915/skl_dmc_ver1_18.bin
+File: i915/skl_dmc_ver1_19.bin
+File: i915/skl_dmc_ver1_20.bin
+File: i915/skl_dmc_ver1_21.bin
 
 File: i915/skl_dmc_ver1.bin
-Version: DMC API/ABI ver 1 - release 18 for Skylake
+Version: DMC API/ABI ver 1 - release 21 for Skylake
 
 File: i915/bxt_dmc_ver1_04.bin
+File: i915/bxt_dmc_ver1_05.bin
 
 File: i915/bxt_dmc_ver1.bin
-Version: DMC API/ABI ver 1 - release 04 for Broxton
+Version: DMC API/ABI ver 1 - release 05 for Broxton
 
 File: i915/skl_guc_ver1_1059.bin
+File: i915/skl_guc_ver4_3.bin
 
 File: i915/skl_guc_ver1.bin
 Version: Guc API/ABI ver 1 - release 1059 for Skylake
 
+File: i915/skl_guc_ver4.bin
+Version: Guc API/ABI ver 4 - release 3 for Skylake
+
 License: Redistributable. See LICENSE.i915 for details
 
 --------------------------------------------------------------------------

diff --git a/i915/bxt_dmc_ver1.bin b/i915/bxt_dmc_ver1.bin
index 9bec7836ee90c967aa93f5cbd51a0d702be4162c..034d5252f55055ca41cab21ada7cfe2c80c5439b 120000 (symlink)
--- a/i915/bxt_dmc_ver1.bin
+++ b/i915/bxt_dmc_ver1.bin
@@ -1 +1 @@
-bxt_dmc_ver1_04.bin
\ No newline at end of file
+bxt_dmc_ver1_05.bin
\ No newline at end of file

diff --git a/i915/bxt_dmc_ver1_05.bin b/i915/bxt_dmc_ver1_05.bin
new file mode 100644 (file)
index 0000000..fcbf5a8
Binary files /dev/null and b/i915/bxt_dmc_ver1_05.bin differ

diff --git a/i915/skl_dmc_ver1.bin b/i915/skl_dmc_ver1.bin
index 9cab5698c0c2ffab17f4f94f819ee24bdb058eb9..4f754d0c1e4ecec57308d43fa9c61c1d9df34972 120000 (symlink)
--- a/i915/skl_dmc_ver1.bin
+++ b/i915/skl_dmc_ver1.bin
@@ -1 +1 @@
-skl_dmc_ver1_18.bin
\ No newline at end of file
+skl_dmc_ver1_21.bin
\ No newline at end of file

diff --git a/i915/skl_dmc_ver1_04.bin b/i915/skl_dmc_ver1_04.bin
deleted file mode 100644 (file)
index 3638187..0000000
Binary files a/i915/skl_dmc_ver1_04.bin and /dev/null differ

diff --git a/i915/skl_dmc_ver1_16.bin b/i915/skl_dmc_ver1_19.bin
similarity index 90%
rename from i915/skl_dmc_ver1_16.bin
rename to i915/skl_dmc_ver1_19.bin
index 16ad42d310f04eb3cefe4319b0bc36d8c7dab5b4..7db75a71c1750283ae6518725702855036e77ba5 100644 (file)
Binary files a/i915/skl_dmc_ver1_16.bin and b/i915/skl_dmc_ver1_19.bin differ

diff --git a/i915/skl_dmc_ver1_18.bin b/i915/skl_dmc_ver1_20.bin
similarity index 58%
rename from i915/skl_dmc_ver1_18.bin
rename to i915/skl_dmc_ver1_20.bin
index 8d1a5922fc724554753a8604150a8158b8d81ca1..8bb1c73580f2731bcb2bbb9b49dc1cbccee07340 100644 (file)
Binary files a/i915/skl_dmc_ver1_18.bin and b/i915/skl_dmc_ver1_20.bin differ

diff --git a/i915/skl_dmc_ver1_21.bin b/i915/skl_dmc_ver1_21.bin
new file mode 100644 (file)
index 0000000..6b79a84
Binary files /dev/null and b/i915/skl_dmc_ver1_21.bin differ

diff --git a/i915/skl_guc_ver4.bin b/i915/skl_guc_ver4.bin
new file mode 120000 (symlink)
index 0000000..3adbf03
--- /dev/null
+++ b/i915/skl_guc_ver4.bin
@@ -0,0 +1 @@
+skl_guc_ver4_3.bin
\ No newline at end of file

diff --git a/i915/skl_guc_ver4_3.bin b/i915/skl_guc_ver4_3.bin
new file mode 100644 (file)
index 0000000..8571de2
Binary files /dev/null and b/i915/skl_guc_ver4_3.bin differ