]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'topic/xehp-dg2-definitions-2021-07-21' into drm-intel-gt-next
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 22 Jul 2021 16:35:16 +0000 (09:35 -0700)
committerMatt Roper <matthew.d.roper@intel.com>
Thu, 22 Jul 2021 16:35:16 +0000 (09:35 -0700)
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>
1  2 
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_pci.c

Simple merge
Simple merge