From 3601521a6d8fc40aef367998bf9bbd10b5e929e7 Mon Sep 17 00:00:00 2001 From: Satyeshwar Singh Date: Thu, 28 May 2020 00:44:26 -0700 Subject: [PATCH] intel/dev: Don't consider all TGL SKUs as GT1 only We should be passing _gt instead of 1 to GEN12_FEATURES or else all TGL SKUs will be considered as gt1 only. Fixes: 54996ad4927 ("intel/dev: Split .num_subslices out of GEN12_FEATURES macro") Signed-off-by: Satyeshwar Singh Reviewed-by: Eric Engestrom Reviewed-by: Jordan Justen Part-of: (cherry picked from commit aaec065f03e65f75fd18f8cc24d003f220209714) --- .pick_status.json | 2 +- src/intel/dev/gen_device_info.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fe51a250282..62f9bf973ee 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3217,7 +3217,7 @@ "description": "intel/dev: Don't consider all TGL SKUs as GT1 only", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "54996ad49273641e20dbb2d7aff382199e27cd10" }, diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c index 1f8ce9a0d11..5fca67d9467 100644 --- a/src/intel/dev/gen_device_info.c +++ b/src/intel/dev/gen_device_info.c @@ -1079,7 +1079,7 @@ static const struct gen_device_info gen_device_info_ehl_4 = { .num_subslices = dual_subslices(1) #define GEN12_GT_FEATURES(_gt) \ - GEN12_FEATURES(1, 1, _gt == 1 ? 4 : 8), \ + GEN12_FEATURES(_gt, 1, _gt == 1 ? 4 : 8), \ .num_subslices = dual_subslices(_gt == 1 ? 2 : 6) static const struct gen_device_info gen_device_info_tgl_gt1 = {