Mesa (master): intel/dev: Use GEN_GEN if defined for gen_device_info_is_9lp

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b257795b10f9e1c0b87f34b8f363a75e4b1d51bb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b257795b10f9e1c0b87f34b8f363a75e4b1d51bb

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Mon Jan  6 02:05:21 2020 -0800

intel/dev: Use GEN_GEN if defined for gen_device_info_is_9lp

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/7757>

---

 src/intel/dev/gen_device_info.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/intel/dev/gen_device_info.h b/src/intel/dev/gen_device_info.h
index ee27c5f8b43..12c79ed3af8 100644
--- a/src/intel/dev/gen_device_info.h
+++ b/src/intel/dev/gen_device_info.h
@@ -273,9 +273,18 @@ struct gen_device_info
    /** @} */
 };
 
+#ifdef GEN_GEN
+
+#define gen_device_info_is_9lp(devinfo) \
+   (GEN_GEN == 9 && ((devinfo)->is_broxton || (devinfo)->is_geminilake))
+
+#else
+
 #define gen_device_info_is_9lp(devinfo) \
    ((devinfo)->is_broxton || (devinfo)->is_geminilake)
 
+#endif
+
 static inline bool
 gen_device_info_subslice_available(const struct gen_device_info *devinfo,
                                    int slice, int subslice)