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 <matthew.d.roper@intel.com>

diff --cc drivers/gpu/drm/i915/i915_drv.h
index be90f5513144c48812bb28e41f783eac34e003c0,d7f46136b1ae89d1f60099f6693785745da68859..bb653adf00319e420d16eb021ffdf05682457f12
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/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)

diff --cc drivers/gpu/drm/i915/i915_pci.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_device_info.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_device_info.h
Simple merge