Mesa (main): intel/pci-ids: Re-enable DG1 and add SG1

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7faad66ab076b499f197d665da6311d9ed18318a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7faad66ab076b499f197d665da6311d9ed18318a

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Mon Jul 30 21:52:02 2018 -0700

intel/pci-ids: Re-enable DG1 and add SG1

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11584>

---

 include/pci_ids/iris_pci_ids.h    |  6 ++++--
 src/intel/dev/intel_device_info.c | 11 ++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h
index 1e8c433b491..42f0c701332 100644
--- a/include/pci_ids/iris_pci_ids.h
+++ b/include/pci_ids/iris_pci_ids.h
@@ -48,5 +48,7 @@ CHIPSET(0x9AC9, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 CHIPSET(0x9AD9, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 CHIPSET(0x9AF8, tgl_gt2, "TGL GT2", "Intel(R) UHD Graphics")
 
-/* Disabled for now until kernel support is ready */
-/* CHIPSET(0x4905, dg1, "DG1 GT2", "Intel(R) Graphics") */
+CHIPSET(0x4905, dg1, "DG1", "Intel(R) Graphics")
+CHIPSET(0x4906, dg1, "DG1", "Intel(R) Graphics")
+CHIPSET(0x4907, sg1, "SG1", "Intel(R) Graphics")
+CHIPSET(0x4908, dg1, "DG1", "Intel(R) Graphics")
diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 6962c93ff7e..6dccd94707f 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -65,6 +65,7 @@ static const struct {
    { "rkl", 0x4c8a },
    { "dg1", 0x4905 },
    { "adl", 0x4680 },
+   { "sg1", 0x4907 },
 };
 
 /**
@@ -994,7 +995,7 @@ static const struct intel_device_info intel_device_info_adl_gt2 = {
    .is_alderlake = true,
 };
 
-#define GFX12_DG1_FEATURES                      \
+#define GFX12_DG1_SG1_FEATURES                  \
    GFX12_GT_FEATURES(2),                        \
    .is_dg1 = true,                              \
    .has_llc = false,                            \
@@ -1002,8 +1003,12 @@ static const struct intel_device_info intel_device_info_adl_gt2 = {
    .urb.size = 768,                             \
    .simulator_id = 30
 
-UNUSED static const struct intel_device_info intel_device_info_dg1 = {
-   GFX12_DG1_FEATURES,
+static const struct intel_device_info intel_device_info_dg1 = {
+   GFX12_DG1_SG1_FEATURES,
+};
+
+static const struct intel_device_info intel_device_info_sg1 = {
+   GFX12_DG1_SG1_FEATURES,
 };
 
 static void