diff -u mesa-11.2.0/debian/changelog mesa-11.2.0/debian/changelog --- mesa-11.2.0/debian/changelog +++ mesa-11.2.0/debian/changelog @@ -1,3 +1,13 @@ +mesa (11.2.0-1ubuntu2.2) xenial; urgency=medium + + * bxt-add-2x6-variant.diff: + Update BXT pciids. (LP: #1577735) + * add-more-kbl-pciids.diff, + remove-obsolete-kbl-pciids.diff: + Update i965 pciids. (LP: #1600124) + + -- Timo Aaltonen Wed, 03 Aug 2016 11:45:31 +0300 + mesa (11.2.0-1ubuntu2.1) xenial; urgency=medium * control, rules: Enable llvm/opencl on arm64. (LP: #1585942) diff -u mesa-11.2.0/debian/patches/series mesa-11.2.0/debian/patches/series --- mesa-11.2.0/debian/patches/series +++ mesa-11.2.0/debian/patches/series @@ -8,0 +9,5 @@ + +# upstream fixes +bxt-add-2x6-variant.diff +add-more-kbl-pciids.diff +remove-obsolete-kbl-pciids.diff only in patch2: unchanged: --- mesa-11.2.0.orig/debian/patches/add-more-kbl-pciids.diff +++ mesa-11.2.0/debian/patches/add-more-kbl-pciids.diff @@ -0,0 +1,34 @@ +commit bdff2e554735ed99173ad6ee1e9934ca37e409b1 +Author: Rodrigo Vivi +Date: Thu Jun 23 14:35:09 2016 -0700 + + i956: Add more Kabylake PCI IDs. + + The spec has been updated adding new PCI IDs. + + Reviewed-by: Dhinakaran Pandiyan + Acked-by: Kenneth Graunke + Signed-off-by: Rodrigo Vivi + +diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h +index fce00da..7a7897f 100644 +--- a/include/pci_ids/i965_pci_ids.h ++++ b/include/pci_ids/i965_pci_ids.h +@@ -137,6 +137,7 @@ CHIPSET(0x193D, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)") + CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1") ++CHIPSET(0x5908, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5") +@@ -149,7 +150,9 @@ CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2") + CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2") + CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2") + CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F") ++CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3") ++CHIPSET(0x5927, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4") only in patch2: unchanged: --- mesa-11.2.0.orig/debian/patches/bxt-add-2x6-variant.diff +++ mesa-11.2.0/debian/patches/bxt-add-2x6-variant.diff @@ -0,0 +1,54 @@ +commit f1fa8b4a1ca73fac4400e13b9aaca8c6b2955d2c +Author: Ben Widawsky +Date: Thu May 26 08:08:29 2016 -0700 + + i965/bxt: Add 2x6 variant + + Cc: mesa-stable@lists.freedesktop.org + Signed-off-by: Ben Widawsky + Reviewed-by: Kristian Høgsberg + +diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h +index bd645fa..fce00da 100644 +--- a/include/pci_ids/i965_pci_ids.h ++++ b/include/pci_ids/i965_pci_ids.h +@@ -162,4 +162,6 @@ CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)") + CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)") + CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)") + CHIPSET(0x1A84, bxt, "Intel(R) HD Graphics (Broxton)") ++CHIPSET(0x1A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)") + CHIPSET(0x5A84, bxt, "Intel(R) HD Graphics (Broxton)") ++CHIPSET(0x5A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)") +diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c b/src/mesa/drivers/dri/i965/brw_device_info.c +index 3666190..77bbe78 100644 +--- a/src/mesa/drivers/dri/i965/brw_device_info.c ++++ b/src/mesa/drivers/dri/i965/brw_device_info.c +@@ -401,6 +401,28 @@ static const struct brw_device_info brw_device_info_bxt = { + } + }; + ++static const struct brw_device_info brw_device_info_bxt_2x6 = { ++ GEN9_FEATURES, ++ .is_broxton = 1, ++ .gt = 1, ++ .has_llc = false, ++ ++ .num_slices = 1, ++ .max_vs_threads = 56, /* XXX: guess */ ++ .max_hs_threads = 56, /* XXX: guess */ ++ .max_ds_threads = 56, ++ .max_gs_threads = 56, ++ .max_wm_threads = 64 * 2, ++ .max_cs_threads = 6 * 6, ++ .urb = { ++ .size = 128, ++ .min_vs_entries = 34, ++ .max_vs_entries = 352, ++ .max_hs_entries = 128, ++ .max_ds_entries = 208, ++ .max_gs_entries = 128, ++ } ++}; + /* + * Note: for all KBL SKUs, the PRM says SKL for GS entries, not SKL+. + * There's no KBL entry. Using the default SKL (GEN9) GS entries value. only in patch2: unchanged: --- mesa-11.2.0.orig/debian/patches/remove-obsolete-kbl-pciids.diff +++ mesa-11.2.0/debian/patches/remove-obsolete-kbl-pciids.diff @@ -0,0 +1,35 @@ +commit 85ea8deb26da420987cbc1023c1f68b8c399e8d8 +Author: Rodrigo Vivi +Date: Thu Jun 23 14:38:18 2016 -0700 + + i965: Removing PCI IDs that are no longer listed as Kabylake. + + This is unusual. Usually IDs listed on early stages of platform + definition are kept there as reserved for later use. + + However these IDs here are not listed anymore in any of steppings + and devices IDs tables for Kabylake on configurations overview + section of BSpec. + + So it is better removing them before they become used in any + other future platform. + + Reviewed-by: Dhinakaran Pandiyan + Acked-by: Kenneth Graunke + Signed-off-by: Rodrigo Vivi + +--- a/include/pci_ids/i965_pci_ids.h ++++ b/include/pci_ids/i965_pci_ids.h +@@ -153,12 +153,7 @@ CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabyl + CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x5927, kbl_gt3, "Intel(R) Kabylake GT3") +-CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3") +-CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3") +-CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4") +-CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4") + CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4") +-CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4") + CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherryview)") + CHIPSET(0x22B1, chv, "Intel(R) HD Graphics (Cherryview)") + CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)")