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>
(cherry picked from commit 45c33313e6)
This commit is contained in:
Jordan Justen 2020-01-14 14:36:25 -08:00 committed by Eric Engestrom
parent 7d5074f4a6
commit c75ab0a241
3 changed files with 20 additions and 1 deletions

View file

@ -175,7 +175,7 @@
"description": "intel/dev: Add device info for RKL",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

View file

@ -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")

View file

@ -69,6 +69,7 @@ gen_device_name_to_pci_device_id(const char *name)
{ "ehl", 0x4500 },
{ "jsl", 0x4E71 },
{ "tgl", 0x9a49 },
{ "rkl", 0x4c8a },
};
for (unsigned i = 0; i < ARRAY_SIZE(name_map); i++) {
@ -1073,6 +1074,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)
@ -1085,6 +1090,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,