OSDN Git Service

Merge branch 'topic/xehp-dg2-definitions-2021-07-21' into drm-intel-next
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 22 Jul 2021 16:23:00 +0000 (09:23 -0700)
committerMatt Roper <matthew.d.roper@intel.com>
Thu, 22 Jul 2021 16:23:00 +0000 (09:23 -0700)
commitc86fc48a2463cd9bd3131eff9ef7547110bb4774
tree192fbe364aa319ba41b6b14f9bd0a8b0660ffe64
parent46b0d7091cb9702265007d0f472846b01c773872
parent9e22cfc5e9b92556a56d8a564cdab31045f29010
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>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_pci.c
drivers/gpu/drm/i915/intel_device_info.c
drivers/gpu/drm/i915/intel_device_info.h