Merge branch 'topic/revid_steppings' into drm-intel-gt-next
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 15 Jul 2021 00:54:25 +0000 (17:54 -0700)
committerMatt Roper <matthew.d.roper@intel.com>
Thu, 15 Jul 2021 00:55:21 +0000 (17:55 -0700)
commitd6e6ac294d91563131265fdf44537aeac2984c21
tree2dc8a17fc2fc57688d3feb9cad5ad2f731f13e13
parent8f88ca76b3942d82e2c1cea8735ec368d89ecc15
parenteee42141e498fa3df3ce524846d52f67a92b6845
Merge branch 'topic/revid_steppings' into drm-intel-gt-next

The switch from old old IS_FOO_REVID() macros to the new table-based
IS_FOO_{GT,DISP}_STEP() macros is needed on both drm-intel-next (for
display-based DMC matching) and drm-intel-gt-next (for workaround
guards).  To avoid conflicts, we'll apply the patches to a topic branch
and merge it to both intel branches to ensure the transition to the
new macros is clean.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
drivers/gpu/drm/i915/display/intel_dpll_mgr.c
drivers/gpu/drm/i915/gt/intel_region_lmem.c
drivers/gpu/drm/i915/gt/intel_workarounds.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_pm.c