From: Matt Roper Date: Thu, 22 Jul 2021 16:23:00 +0000 (-0700) Subject: Merge branch 'topic/xehp-dg2-definitions-2021-07-21' into drm-intel-next X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c86fc48a2463cd9bd3131eff9ef7547110bb4774;p=uclinux-h8%2Flinux.git Merge branch 'topic/xehp-dg2-definitions-2021-07-21' into drm-intel-next As we begin applying XeHP and DG2 patches, the basic platform definitions and macros (like IS_DG2()) will be needed in both drm-intel-next and drm-intel-gt-next. Those initial definition patches are applied to a topic branch and merged to both trees. Signed-off-by: Matt Roper --- c86fc48a2463cd9bd3131eff9ef7547110bb4774 diff --cc drivers/gpu/drm/i915/i915_drv.h index be90f5513144,d7f46136b1ae..bb653adf0031 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@@ -1241,8 -1237,23 +1241,10 @@@ static inline struct drm_i915_private * #define INTEL_DEVID(dev_priv) (RUNTIME_INFO(dev_priv)->device_id) -/* - * Deprecated: this will be replaced by individual IP checks: - * GRAPHICS_VER(), MEDIA_VER() and DISPLAY_VER() - */ -#define INTEL_GEN(dev_priv) GRAPHICS_VER(dev_priv) -/* - * Deprecated: use IS_GRAPHICS_VER(), IS_MEDIA_VER() and IS_DISPLAY_VER() as - * appropriate. - */ -#define IS_GEN_RANGE(dev_priv, s, e) IS_GRAPHICS_VER(dev_priv, (s), (e)) -/* - * Deprecated: use GRAPHICS_VER(), MEDIA_VER() and DISPLAY_VER() as appropriate. - */ -#define IS_GEN(dev_priv, n) (GRAPHICS_VER(dev_priv) == (n)) +#define IP_VER(ver, rel) ((ver) << 8 | (rel)) + #define IP_VER(ver, rel) ((ver) << 8 | (rel)) + #define GRAPHICS_VER(i915) (INTEL_INFO(i915)->graphics_ver) #define GRAPHICS_VER_FULL(i915) IP_VER(INTEL_INFO(i915)->graphics_ver, \ INTEL_INFO(i915)->graphics_rel)