From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Thu, 9 Jul 2020 22:47:36 +0000 (-0700)
Subject: intel/ehl: Use macro GEN11_LP_FEATURES in device info
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=13c70931f595bd729e46e5fa25b9bffde2628575;p=mesa.git

intel/ehl: Use macro GEN11_LP_FEATURES in device info

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---

diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 38caf699bde..4d5b5de68ea 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -910,47 +910,35 @@ static const struct gen_device_info gen_device_info_icl_gt0_5 = {
    .simulator_id = 19,
 };
 
+#define GEN11_LP_FEATURES                           \
+   .is_elkhartlake = true,                          \
+   .urb = {                                         \
+      GEN11_URB_MIN_MAX_ENTRIES,                    \
+   },                                               \
+   .disable_ccs_repack = true,                      \
+   .simulator_id = 28
+
 static const struct gen_device_info gen_device_info_ehl_7 = {
    GEN11_FEATURES(1, 1, subslices(4), 4),
-   .is_elkhartlake = true,
-   .urb = {
-      GEN11_URB_MIN_MAX_ENTRIES,
-   },
-   .disable_ccs_repack = true,
-   .simulator_id = 28,
+   GEN11_LP_FEATURES,
 };
 
 static const struct gen_device_info gen_device_info_ehl_6 = {
    GEN11_FEATURES(1, 1, subslices(4), 4),
-   .is_elkhartlake = true,
-   .urb = {
-      GEN11_URB_MIN_MAX_ENTRIES,
-   },
-   .disable_ccs_repack = true,
+   GEN11_LP_FEATURES,
    .num_eu_per_subslice = 6,
-   .simulator_id = 28,
 };
 
 static const struct gen_device_info gen_device_info_ehl_5 = {
    GEN11_FEATURES(1, 1, subslices(4), 4),
-   .is_elkhartlake = true,
-   .urb = {
-      GEN11_URB_MIN_MAX_ENTRIES,
-   },
-   .disable_ccs_repack = true,
+   GEN11_LP_FEATURES,
    .num_eu_per_subslice = 4,
-   .simulator_id = 28,
 };
 
 static const struct gen_device_info gen_device_info_ehl_4 = {
    GEN11_FEATURES(1, 1, subslices(2), 4),
-   .is_elkhartlake = true,
-   .urb = {
-      GEN11_URB_MIN_MAX_ENTRIES,
-   },
-   .disable_ccs_repack = true,
+   GEN11_LP_FEATURES,
    .num_eu_per_subslice =4,
-   .simulator_id = 28,
 };
 
 #define GEN12_URB_MIN_MAX_ENTRIES                   \