From d795a66f81a78171e20a41454bd706bf21e8b335 Mon Sep 17 00:00:00 2001
From: Filip Hazubski <filip.hazubski@intel.com>
Date: Tue, 20 Feb 2024 16:26:15 +0000
Subject: [PATCH] fix: Add new DG1 and RPL-S device IDs

Added DG1 device ID: 0x4909
Added RPL-S device ID: 0x468B

Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
---
 .../gen12lp/adls/linux/dll/device_id_tests_adls.cpp          | 5 +++--
 .../unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp  | 5 +++--
 shared/source/dll/devices/devices_base.inl                   | 2 ++
 shared/source/gen12lp/adls/device_ids_configs_adls.h         | 3 ++-
 shared/source/gen12lp/dg1/device_ids_configs_dg1.h           | 5 +++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/opencl/test/unit_test/gen12lp/adls/linux/dll/device_id_tests_adls.cpp b/opencl/test/unit_test/gen12lp/adls/linux/dll/device_id_tests_adls.cpp
index fc04ed991c..968730a8bf 100644
--- a/opencl/test/unit_test/gen12lp/adls/linux/dll/device_id_tests_adls.cpp
+++ b/opencl/test/unit_test/gen12lp/adls/linux/dll/device_id_tests_adls.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,11 +10,12 @@
 using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenAdlsSupportedDeviceIdThenHardwareInfoIsCorrect) {
-    std::array<DeviceDescriptor, 14> expectedDescriptors = {{
+    std::array<DeviceDescriptor, 15> expectedDescriptors = {{
         {0x4680, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
         {0x4682, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
         {0x4688, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
         {0x468A, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0x468B, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
         {0x4690, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
         {0x4692, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
         {0x4693, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
diff --git a/opencl/test/unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp
index 42d25e5750..c84f773169 100644
--- a/opencl/test/unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp
+++ b/opencl/test/unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,11 +9,12 @@
 using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenDg1SupportedDeviceIdThenHardwareInfoIsCorrect) {
-    std::array<DeviceDescriptor, 4> expectedDescriptors = {{
+    std::array<DeviceDescriptor, 5> expectedDescriptors = {{
         {0x4905, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
         {0x4906, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
         {0x4907, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
         {0x4908, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
+        {0x4909, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/shared/source/dll/devices/devices_base.inl b/shared/source/dll/devices/devices_base.inl
index a012175cfc..62f41ca421 100644
--- a/shared/source/dll/devices/devices_base.inl
+++ b/shared/source/dll/devices/devices_base.inl
@@ -91,6 +91,7 @@ NAMEDDEVICE(0x4905, Dg1HwConfig, "Intel(R) Iris(R) Xe MAX Graphics")
 DEVICE(0x4906, Dg1HwConfig)
 NAMEDDEVICE(0x4907, Dg1HwConfig, "Intel(R) Server GPU SG-18M")
 NAMEDDEVICE(0x4908, Dg1HwConfig, "Intel(R) Iris(R) Xe Graphics")
+NAMEDDEVICE(0x4909, Dg1HwConfig, "Intel(R) Iris(R) Xe MAX 100 Graphics")
 #endif
 
 #ifdef SUPPORT_RKL
@@ -107,6 +108,7 @@ NAMEDDEVICE(0x4680, AdlsHwConfig, "Intel(R) UHD Graphics 770")
 NAMEDDEVICE(0x4682, AdlsHwConfig, "Intel(R) UHD Graphics 730")
 NAMEDDEVICE(0x4688, AdlsHwConfig, "Intel(R) UHD Graphics")
 NAMEDDEVICE(0x468A, AdlsHwConfig, "Intel(R) UHD Graphics")
+NAMEDDEVICE(0x468B, AdlsHwConfig, "Intel(R) UHD Graphics")
 NAMEDDEVICE(0x4690, AdlsHwConfig, "Intel(R) UHD Graphics 770")
 NAMEDDEVICE(0x4692, AdlsHwConfig, "Intel(R) UHD Graphics 730")
 NAMEDDEVICE(0x4693, AdlsHwConfig, "Intel(R) UHD Graphics 710")
diff --git a/shared/source/gen12lp/adls/device_ids_configs_adls.h b/shared/source/gen12lp/adls/device_ids_configs_adls.h
index 3688b41c17..fb9c51c68a 100644
--- a/shared/source/gen12lp/adls/device_ids_configs_adls.h
+++ b/shared/source/gen12lp/adls/device_ids_configs_adls.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,6 +15,7 @@ inline const std::vector<unsigned short> adlsDeviceIds{
     0x4682,
     0x4688,
     0x468A,
+    0x468B,
     0x4690,
     0x4692,
     0x4693,
diff --git a/shared/source/gen12lp/dg1/device_ids_configs_dg1.h b/shared/source/gen12lp/dg1/device_ids_configs_dg1.h
index f149097c87..976c77ffee 100644
--- a/shared/source/gen12lp/dg1/device_ids_configs_dg1.h
+++ b/shared/source/gen12lp/dg1/device_ids_configs_dg1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,5 +14,6 @@ inline const std::vector<unsigned short> dg1DeviceIds{
     0x4905,
     0x4906,
     0x4907,
-    0x4908};
+    0x4908,
+    0x4909};
 } // namespace NEO