intel/dev: Add device info for RKL

Cc: 20.1 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by : Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4955>

diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h
index a8dee3ddb3a3e9d47c85e8068cff9785a73ce1eb..ed79c654944884aa652362d91f3b772839231f75 100644 (file)
--- a/include/pci_ids/iris_pci_ids.h
+++ b/include/pci_ids/iris_pci_ids.h
@@ -1,3 +1,9 @@
+CHIPSET(0x4c8a, rkl_gt1, "RKL GT1", "Intel(R) Graphics")
+CHIPSET(0x4c8b, rkl_gt1, "RKL GT1", "Intel(R) Graphics")
+CHIPSET(0x4c8c, rkl_gt05, "RKL GT0.5", "Intel(R) Graphics")
+CHIPSET(0x4c90, rkl_gt1, "RKL GT1", "Intel(R) Graphics")
+CHIPSET(0x4c9a, rkl_gt1, "RKL GT1", "Intel(R) Graphics")
+
 CHIPSET(0x9A40, tgl_gt2, "TGL GT2", "Intel(R) Xe Graphics")
 CHIPSET(0x9A49, tgl_gt2, "TGL GT2", "Intel(R) Xe Graphics")
 CHIPSET(0x9A59, tgl_gt2, "TGL GT2", "Intel(R) Graphics")

diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 0fd8339ee40c86fc5e7e7b3102c95310572ce285..92044501d91d527466912e9b1867307de168034c 100644 (file)
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -61,6 +61,7 @@ static const struct {
    { "ehl", 0x4500 },
    { "jsl", 0x4E71 },
    { "tgl", 0x9a49 },
+   { "rkl", 0x4c8a },
 };
 
 /**
@@ -1053,6 +1054,10 @@ static const struct gen_device_info gen_device_info_ehl_4 = {
 
 #define dual_subslices(args...) { args, }
 
+#define GEN12_GT05_FEATURES                                     \
+   GEN12_FEATURES(1, 1, 4),                                     \
+   .num_subslices = dual_subslices(1)
+
 #define GEN12_GT_FEATURES(_gt)                                  \
    GEN12_FEATURES(1, 1, _gt == 1 ? 4 : 8),                      \
    .num_subslices = dual_subslices(_gt == 1 ? 2 : 6)
@@ -1065,6 +1070,14 @@ static const struct gen_device_info gen_device_info_tgl_gt2 = {
    GEN12_GT_FEATURES(2),
 };
 
+static const struct gen_device_info gen_device_info_rkl_gt05 = {
+   GEN12_GT05_FEATURES,
+};
+
+static const struct gen_device_info gen_device_info_rkl_gt1 = {
+   GEN12_GT_FEATURES(1),
+};
+
 static void
 gen_device_info_set_eu_mask(struct gen_device_info *devinfo,
                             unsigned slice,