|
 |
ed65e5 |
From 591c1d72abbc1ae67890a50dc107a0e4b9ef13c3 Mon Sep 17 00:00:00 2001
|
|
|
ed65e5 |
From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <jose.souza@intel.com>
|
|
|
ed65e5 |
Date: Tue, 19 Jun 2018 16:45:20 -0700
|
|
|
ed65e5 |
Subject: [PATCH libdrm] intel: Introducing Whiskey Lake platform
|
|
|
ed65e5 |
MIME-Version: 1.0
|
|
|
ed65e5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ed65e5 |
Content-Transfer-Encoding: 8bit
|
|
|
ed65e5 |
|
|
|
ed65e5 |
Whiskey Lake uses the same gen graphics as Coffe Lake, including some
|
|
|
ed65e5 |
ids that were previously marked as reserved on Coffe Lake, but that
|
|
|
ed65e5 |
now are moved to WHL page.
|
|
|
ed65e5 |
|
|
|
ed65e5 |
So, let's just move them to WHL macros that will feed into CFL macro
|
|
|
ed65e5 |
just to keep it better organized to make easier future code review
|
|
|
ed65e5 |
but it will be handled as a CFL.
|
|
|
ed65e5 |
|
|
|
ed65e5 |
This is a copy of merged i915's
|
|
|
ed65e5 |
commit b9be78531d27 ("drm/i915/whl: Introducing Whiskey Lake platform")
|
|
|
ed65e5 |
|
|
|
ed65e5 |
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
|
|
|
ed65e5 |
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
|
|
|
ed65e5 |
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
|
|
|
ed65e5 |
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
|
|
|
ed65e5 |
---
|
|
|
ed65e5 |
intel/intel_chipset.h | 33 +++++++++++++++++----------------
|
|
|
ed65e5 |
1 file changed, 17 insertions(+), 16 deletions(-)
|
|
|
ed65e5 |
|
|
|
ed65e5 |
diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
|
|
|
ed65e5 |
index 32b2c48f..44e65f9e 100644
|
|
|
ed65e5 |
--- a/intel/intel_chipset.h
|
|
|
ed65e5 |
+++ b/intel/intel_chipset.h
|
|
|
ed65e5 |
@@ -231,16 +231,17 @@
|
|
|
ed65e5 |
#define PCI_CHIP_COFFEELAKE_S_GT2_4 0x3E9A
|
|
|
ed65e5 |
#define PCI_CHIP_COFFEELAKE_H_GT2_1 0x3E9B
|
|
|
ed65e5 |
#define PCI_CHIP_COFFEELAKE_H_GT2_2 0x3E94
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT1_1 0x3EA1
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT1_2 0x3EA4
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT2_1 0x3EA0
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT2_2 0x3EA3
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT2_3 0x3EA9
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT3_1 0x3EA2
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT3_2 0x3EA5
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA6
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA7
|
|
|
ed65e5 |
-#define PCI_CHIP_COFFEELAKE_U_GT3_5 0x3EA8
|
|
|
ed65e5 |
+#define PCI_CHIP_COFFEELAKE_U_GT2_1 0x3EA9
|
|
|
ed65e5 |
+#define PCI_CHIP_COFFEELAKE_U_GT3_1 0x3EA5
|
|
|
ed65e5 |
+#define PCI_CHIP_COFFEELAKE_U_GT3_2 0x3EA6
|
|
|
ed65e5 |
+#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA7
|
|
|
ed65e5 |
+#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA8
|
|
|
ed65e5 |
+
|
|
|
ed65e5 |
+#define PCI_CHIP_WHISKEYLAKE_U_GT1_1 0x3EA1
|
|
|
ed65e5 |
+#define PCI_CHIP_WHISKEYLAKE_U_GT2_1 0x3EA0
|
|
|
ed65e5 |
+#define PCI_CHIP_WHISKEYLAKE_U_GT3_1 0x3EA2
|
|
|
ed65e5 |
+#define PCI_CHIP_WHISKEYLAKE_U_GT3_2 0x3EA3
|
|
|
ed65e5 |
+#define PCI_CHIP_WHISKEYLAKE_U_GT3_3 0x3EA4
|
|
|
ed65e5 |
|
|
|
ed65e5 |
#define PCI_CHIP_CANNONLAKE_0 0x5A51
|
|
|
ed65e5 |
#define PCI_CHIP_CANNONLAKE_1 0x5A59
|
|
|
ed65e5 |
@@ -510,16 +511,16 @@
|
|
|
ed65e5 |
#define IS_CFL_H(devid) ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
|
|
|
ed65e5 |
(devid) == PCI_CHIP_COFFEELAKE_H_GT2_2)
|
|
|
ed65e5 |
|
|
|
ed65e5 |
-#define IS_CFL_U(devid) ((devid) == PCI_CHIP_COFFEELAKE_U_GT1_1 || \
|
|
|
ed65e5 |
- (devid) == PCI_CHIP_COFFEELAKE_U_GT1_2 || \
|
|
|
ed65e5 |
- (devid) == PCI_CHIP_COFFEELAKE_U_GT2_1 || \
|
|
|
ed65e5 |
- (devid) == PCI_CHIP_COFFEELAKE_U_GT2_2 || \
|
|
|
ed65e5 |
- (devid) == PCI_CHIP_COFFEELAKE_U_GT2_3 || \
|
|
|
ed65e5 |
+#define IS_CFL_U(devid) ((devid) == PCI_CHIP_COFFEELAKE_U_GT2_1 || \
|
|
|
ed65e5 |
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \
|
|
|
ed65e5 |
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_2 || \
|
|
|
ed65e5 |
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_3 || \
|
|
|
ed65e5 |
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_4 || \
|
|
|
ed65e5 |
- (devid) == PCI_CHIP_COFFEELAKE_U_GT3_5)
|
|
|
ed65e5 |
+ (devid) == PCI_CHIP_WHISKEYLAKE_U_GT1_1 || \
|
|
|
ed65e5 |
+ (devid) == PCI_CHIP_WHISKEYLAKE_U_GT2_1 || \
|
|
|
ed65e5 |
+ (devid) == PCI_CHIP_WHISKEYLAKE_U_GT3_1 || \
|
|
|
ed65e5 |
+ (devid) == PCI_CHIP_WHISKEYLAKE_U_GT3_2 || \
|
|
|
ed65e5 |
+ (devid) == PCI_CHIP_WHISKEYLAKE_U_GT3_3)
|
|
|
ed65e5 |
|
|
|
ed65e5 |
#define IS_COFFEELAKE(devid) (IS_CFL_S(devid) || \
|
|
|
ed65e5 |
IS_CFL_H(devid) || \
|
|
|
ed65e5 |
--
|
|
|
ed65e5 |
2.17.1
|
|
|
ed65e5 |
|