7084842c1c
- Fix (hopefully) various crashes in FlushAllOutput() (rhbz#1382444) - Fix Xwayland crashing in glamor on non glamor capable hw (rhbz#1390018)
89 lines
4.7 KiB
Diff
89 lines
4.7 KiB
Diff
From 7513da40a656317ad3aa101651d29373de99c798 Mon Sep 17 00:00:00 2001
|
|
From: Timo Aaltonen <tjaalton@ubuntu.com>
|
|
Date: Wed, 2 Nov 2016 17:18:11 +0200
|
|
Subject: [PATCH xserver v2 2/7] dri2: Sync i965_pci_ids.h from mesa
|
|
|
|
Import changes from these mesa commits:
|
|
85ea8deb26da420 i965: Removing PCI IDs that are no longer listed as Kabylake.
|
|
bdff2e554735ed9 i956: Add more Kabylake PCI IDs.
|
|
f1fa8b4a1ca73fa i965/bxt: Add 2x6 variant
|
|
d1ab544bb883d04 i965/chv: Display proper branding
|
|
20e8ee36627f874 i965/skl: Update Skylake renderer strings
|
|
644c8a515192d28 i965/skl: Add two missing device IDs
|
|
|
|
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
Signed-off-by: Timo Aaltonen <tjaalton@ubuntu.com>
|
|
---
|
|
hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 32 +++++++++++++++++---------------
|
|
1 file changed, 17 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
|
|
index 5139e27..1566afd 100644
|
|
--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
|
|
+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
|
|
@@ -112,6 +112,7 @@ CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
|
|
CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
|
|
CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
|
|
CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
|
|
+CHIPSET(0x190B, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
|
|
CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
|
|
CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
|
|
CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
|
|
@@ -122,19 +123,21 @@ CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
|
|
CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
|
|
CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
|
|
CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
|
|
-CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
|
|
-CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
|
|
-CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
|
|
+CHIPSET(0x1921, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
|
|
+CHIPSET(0x1923, skl_gt3, "Intel(R) Skylake GT3e")
|
|
+CHIPSET(0x1926, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
|
|
CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
|
|
CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
|
|
-CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
|
|
-CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
|
|
-CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
|
|
-CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
|
|
-CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
|
|
+CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics 555 (Skylake GT3e)")
|
|
+CHIPSET(0x192D, skl_gt3, "Intel(R) Iris Graphics P555 (Skylake GT3e)")
|
|
+CHIPSET(0x1932, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)")
|
|
+CHIPSET(0x193A, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)")
|
|
+CHIPSET(0x193B, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)")
|
|
+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")
|
|
@@ -147,17 +150,16 @@ 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(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(0x5927, kbl_gt3, "Intel(R) Kabylake GT3")
|
|
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(0x22B0, chv, "Intel(R) HD Graphics (Cherrytrail)")
|
|
+CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */
|
|
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)")
|
|
--
|
|
2.9.3
|
|
|