[Encode] Add some missing device IDs.
Fixes: #507
diff --git a/media_driver/linux/common/os/i915/include/intel_chipset.h b/media_driver/linux/common/os/i915/include/intel_chipset.h
index a185b3b..16ea97d 100644
--- a/media_driver/linux/common/os/i915/include/intel_chipset.h
+++ b/media_driver/linux/common/os/i915/include/intel_chipset.h
@@ -220,16 +220,27 @@
#define PCI_CHIP_COFFEELAKE_S_GT1_1 0x3E90
#define PCI_CHIP_COFFEELAKE_S_GT1_2 0x3E93
+#define PCI_CHIP_COFFEELAKE_S_GT1_3 0x3E99
#define PCI_CHIP_COFFEELAKE_S_GT2_1 0x3E91
#define PCI_CHIP_COFFEELAKE_S_GT2_2 0x3E92
#define PCI_CHIP_COFFEELAKE_S_GT2_3 0x3E96
+#define PCI_CHIP_COFFEELAKE_S_GT2_4 0x3E98
+#define PCI_CHIP_COFFEELAKE_S_GT2_5 0x3E9A
+#define PCI_CHIP_COFFEELAKE_H_GT1_1 0x3E9C
#define PCI_CHIP_COFFEELAKE_H_GT2_1 0x3E9B
#define PCI_CHIP_COFFEELAKE_H_GT2_2 0x3E94
+#define PCI_CHIP_COFFEELAKE_U_GT2_1 0x3EA9
#define PCI_CHIP_COFFEELAKE_U_GT3_1 0x3EA5
#define PCI_CHIP_COFFEELAKE_U_GT3_2 0x3EA6
#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA7
#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA8
+#define PCI_CHIP_WHISKYLAKE_U_GT2_1 0x3EA0
+#define PCI_CHIP_WHISKYLAKE_U_GT1_1 0x3EA1
+#define PCI_CHIP_WHISKYLAKE_U_GT3_1 0x3EA2
+#define PCI_CHIP_WHISKYLAKE_U_GT2_2 0x3EA3
+#define PCI_CHIP_WHISKYLAKE_U_GT1_2 0x3EA4
+
#define PCI_CHIP_CANNONLAKE_U_GT2_0 0x5A52
#define PCI_CHIP_CANNONLAKE_U_GT2_1 0x5A5A
#define PCI_CHIP_CANNONLAKE_U_GT2_2 0x5A42
@@ -471,20 +482,33 @@
#define IS_COFFEELAKE(devid) ((devid) == PCI_CHIP_COFFEELAKE_S_GT1_1 || \
(devid) == PCI_CHIP_COFFEELAKE_S_GT1_2 || \
+ (devid) == PCI_CHIP_COFFEELAKE_S_GT1_3 || \
(devid) == PCI_CHIP_COFFEELAKE_S_GT2_1 || \
(devid) == PCI_CHIP_COFFEELAKE_S_GT2_2 || \
(devid) == PCI_CHIP_COFFEELAKE_S_GT2_3 || \
+ (devid) == PCI_CHIP_COFFEELAKE_S_GT2_4 || \
+ (devid) == PCI_CHIP_COFFEELAKE_S_GT2_5 || \
+ (devid) == PCI_CHIP_COFFEELAKE_H_GT1_1 || \
(devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
(devid) == PCI_CHIP_COFFEELAKE_H_GT2_2 || \
+ (devid) == PCI_CHIP_COFFEELAKE_U_GT2_1 || \
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_2 || \
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_3 || \
(devid) == PCI_CHIP_COFFEELAKE_U_GT3_4)
+#define IS_WHISKYLAKE(devid) ((devid) == PCI_CHIP_WHISKYLAKE_U_GT1_1 || \
+ (devid) == PCI_CHIP_WHISKYLAKE_U_GT1_2 || \
+ (devid) == PCI_CHIP_WHISKYLAKE_U_GT2_1 || \
+ (devid) == PCI_CHIP_WHISKYLAKE_U_GT2_2 || \
+ (devid) == PCI_CHIP_WHISKYLAKE_U_GT3_1
+
+
#define IS_GEN9(devid) (IS_SKYLAKE(devid) || \
IS_BROXTON(devid) || \
IS_KABYLAKE(devid) || \
- IS_COFFEELAKE(devid))
+ IS_COFFEELAKE(devid) || \
+ IS_WHISKYLAKE(devid))
#define IS_CNL_Y(devid) ((devid) == PCI_CHIP_CANNONLAKE_Y_GT2_0 || \
(devid) == PCI_CHIP_CANNONLAKE_Y_GT2_1 || \
diff --git a/media_driver/linux/gen9/ddi/media_sysinfo_g9.cpp b/media_driver/linux/gen9/ddi/media_sysinfo_g9.cpp
index 10c33fc..4c94a1f 100644
--- a/media_driver/linux/gen9/ddi/media_sysinfo_g9.cpp
+++ b/media_driver/linux/gen9/ddi/media_sysinfo_g9.cpp
@@ -801,6 +801,9 @@
static bool cflDevice3e93 = DeviceInfoFactory<GfxDeviceInfo>::
RegisterDevice(0x3e93, &cflGt1Info);
+static bool cflDevice3e99 = DeviceInfoFactory<GfxDeviceInfo>::
+ RegisterDevice(0x3e99, &cflGt1Info);
+
static bool cflDevice3e90 = DeviceInfoFactory<GfxDeviceInfo>::
RegisterDevice(0x3e90, &cflGt1Info);
@@ -811,14 +814,23 @@
RegisterDevice(0x3e94, &cflGt2Info);
static bool cflDevice3e91 = DeviceInfoFactory<GfxDeviceInfo>::
- RegisterDevice(0x3e91, &cflGt1Info);
+ RegisterDevice(0x3e91, &cflGt2Info);
static bool cflDevice3e96 = DeviceInfoFactory<GfxDeviceInfo>::
RegisterDevice(0x3e96, &cflGt2Info);
+static bool cflDevice3e98 = DeviceInfoFactory<GfxDeviceInfo>::
+ RegisterDevice(0x3e98, &cflGt2Info);
+
+static bool cflDevice3e9a = DeviceInfoFactory<GfxDeviceInfo>::
+ RegisterDevice(0x3e9a, &cflGt2Info);
+
static bool cflDevice3e9b = DeviceInfoFactory<GfxDeviceInfo>::
RegisterDevice(0x3e9b, &cflGt2Info);
+static bool cflDevice3e9c = DeviceInfoFactory<GfxDeviceInfo>::
+ RegisterDevice(0x3e9c, &cflGt1Info);
+
static bool cflDevice3ea5 = DeviceInfoFactory<GfxDeviceInfo>::
RegisterDevice(0x3ea5, &cflGt3eInfo);
@@ -831,6 +843,9 @@
static bool cflDevice3ea8 = DeviceInfoFactory<GfxDeviceInfo>::
RegisterDevice(0x3ea8, &cflGt3eInfo);
+static bool cflDevice3ea9 = DeviceInfoFactory<GfxDeviceInfo>::
+ RegisterDevice(0x3ea9, &cflGt2Info);
+
static bool cflDevice3ea1 = DeviceInfoFactory<GfxDeviceInfo>::
RegisterDevice(0x3ea1, &cflGt1Info);